Merging complete. Everything looks good *crosses fingers*

1 files changed, 17 insertions, 17 deletions

diff --git a/Test/z3api/Boog24.bpl b/Test/z3api/Boog24.bpl
index d3da775d..05da0153 100644
--- a/Test/z3api/Boog24.bpl
+++ b/Test/z3api/Boog24.bpl
@@ -1,17 +1,17 @@
-type ref;

- 

-function LIFT(a:bool) returns (int);

-axiom(forall a:bool :: {LIFT(a)} a <==> LIFT(a) != 0);

-

-procedure  main ( ) 

-

-{

-var a : int;

-var b : int;

-var c : int;

-

-c := LIFT (b < a) ;

-assert (c != 0 <==> b < a);

-

-}

-

+type ref;
+ 
+function LIFT(a:bool) returns (int);
+axiom(forall a:bool :: {LIFT(a)} a <==> LIFT(a) != 0);
+
+procedure  main ( ) 
+
+{
+var a : int;
+var b : int;
+var c : int;
+
+c := LIFT (b < a) ;
+assert (c != 0 <==> b < a);
+
+}
+