Merging complete. Everything looks good *crosses fingers*

1 files changed, 22 insertions, 22 deletions

diff --git a/Test/z3api/boog12.bpl b/Test/z3api/boog12.bpl
index c277a674..fe3803e9 100644
--- a/Test/z3api/boog12.bpl
+++ b/Test/z3api/boog12.bpl
@@ -1,22 +1,22 @@
-type ref;

-// types

-type Color;

-const blue: Color;

-

-var myArray:[int] Color;

-var myMatrix:[int,int] Color;

-

-// procedure

-procedure SetTo(c: Color);

-  modifies myArray, myMatrix

-;

-

-  ensures myArray[0]==c;

-

-implementation SetTo(c: Color) {

-  myMatrix[0,1]:=c;

-  myArray[0]:=blue;

-}

-

-

-

+type ref;
+// types
+type Color;
+const blue: Color;
+
+var myArray:[int] Color;
+var myMatrix:[int,int] Color;
+
+// procedure
+procedure SetTo(c: Color);
+  modifies myArray, myMatrix
+;
+
+  ensures myArray[0]==c;
+
+implementation SetTo(c: Color) {
+  myMatrix[0,1]:=c;
+  myArray[0]:=blue;
+}
+
+
+