Merging complete. Everything looks good *crosses fingers*

1 files changed, 26 insertions, 26 deletions

diff --git a/Test/z3api/bar1.bpl b/Test/z3api/bar1.bpl
index 845954d5..b22f0237 100644
--- a/Test/z3api/bar1.bpl
+++ b/Test/z3api/bar1.bpl
@@ -1,26 +1,26 @@
-var x: int;

-var y: int;

-

-procedure {:inline 1} bar()

-modifies y;

-{

-  y := y + 1;

-}

-

-procedure {:inline 1} foo() 

-modifies x, y;

-{

-  x := x + 1;

-  call bar();

-  call bar();

-  x := x + 1;

-}

-

-procedure main()

-requires x == y;

-ensures x != y;

-modifies x, y;

-{

-  call foo();

-}

-

+var x: int;
+var y: int;
+
+procedure {:inline 1} bar()
+modifies y;
+{
+  y := y + 1;
+}
+
+procedure {:inline 1} foo() 
+modifies x, y;
+{
+  x := x + 1;
+  call bar();
+  call bar();
+  x := x + 1;
+}
+
+procedure main()
+requires x == y;
+ensures x != y;
+modifies x, y;
+{
+  call foo();
+}
+