Merging complete. Everything looks good *crosses fingers*

1 files changed, 11 insertions, 11 deletions

diff --git a/Test/z3api/boog16.bpl b/Test/z3api/boog16.bpl
index a002c166..6e741cbf 100644
--- a/Test/z3api/boog16.bpl
+++ b/Test/z3api/boog16.bpl
@@ -1,12 +1,12 @@
-type ref;

-function choose(a:bool, b:int, c:int) returns (x:int);

-axiom(forall a:bool, b:int, c:int :: 

-  {choose(a,b,c)} !a ==> choose(a,b,c) == c);

-

-var myInt:int;

-procedure  main() 

-modifies myInt;

-ensures myInt==5;

-{

-  myInt:=4;

+type ref;
+function choose(a:bool, b:int, c:int) returns (x:int);
+axiom(forall a:bool, b:int, c:int :: 
+  {choose(a,b,c)} !a ==> choose(a,b,c) == c);
+
+var myInt:int;
+procedure  main() 
+modifies myInt;
+ensures myInt==5;
+{
+  myInt:=4;
 }
\ No newline at end of file