Merging complete. Everything looks good *crosses fingers*

1 files changed, 15 insertions, 15 deletions

diff --git a/Test/z3api/boog18.bpl b/Test/z3api/boog18.bpl
index 35f7d48a..996b502e 100644
--- a/Test/z3api/boog18.bpl
+++ b/Test/z3api/boog18.bpl
@@ -1,16 +1,16 @@
-type ref;

-const A100INT4_name:int;

-

-function Match(a:int, t:int) returns (int);

-function Array(int, int, int) returns (bool);

-

-axiom(forall a:int :: {Match(a, A100INT4_name)} Array(a, 4, 100));

-

-const myNull: int;

-var p: int;

-procedure main() 

-modifies p;

-ensures p!=myNull;

-{

-  p:=myNull;

+type ref;
+const A100INT4_name:int;
+
+function Match(a:int, t:int) returns (int);
+function Array(int, int, int) returns (bool);
+
+axiom(forall a:int :: {Match(a, A100INT4_name)} Array(a, 4, 100));
+
+const myNull: int;
+var p: int;
+procedure main() 
+modifies p;
+ensures p!=myNull;
+{
+  p:=myNull;
 }
\ No newline at end of file