Merging complete. Everything looks good *crosses fingers*

1 files changed, 17 insertions, 17 deletions

diff --git a/Test/z3api/boog28.bpl b/Test/z3api/boog28.bpl
index ab7f4ad2..d59d3630 100644
--- a/Test/z3api/boog28.bpl
+++ b/Test/z3api/boog28.bpl
@@ -1,17 +1,17 @@
-type ref;

- 

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

-axiom(forall x:bool :: {LIFT(x)} x <==> LIFT(x) != 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(x:bool) returns (int);
+axiom(forall x:bool :: {LIFT(x)} x <==> LIFT(x) != 0);
+
+procedure  main ( ) 
+
+{
+var a : int;
+var b : int;
+var c : int;
+
+c := LIFT (b == a) ;
+assert (c != 0 <==> b == a);
+
+}
+