Merging complete. Everything looks good *crosses fingers*

1 files changed, 23 insertions, 23 deletions

diff --git a/Test/z3api/boog9.bpl b/Test/z3api/boog9.bpl
index 3bd6ff63..7ba21eb3 100644
--- a/Test/z3api/boog9.bpl
+++ b/Test/z3api/boog9.bpl
@@ -1,23 +1,23 @@
-type ref;

-// types

-type Wicket;

-var favorite: Wicket;

-

-function age(w:Wicket) returns (int);

-axiom (forall v:Wicket :: age(v)==7);

-axiom (exists v:Wicket :: age(v)<8);

-

-

-// procedure

-procedure SetToSeven(p: Wicket);

-  modifies favorite

-;

-

-  ensures favorite==p;

-

-implementation SetToSeven(l: Wicket) {

-  favorite:=favorite;

-}

-

-

-

+type ref;
+// types
+type Wicket;
+var favorite: Wicket;
+
+function age(w:Wicket) returns (int);
+axiom (forall v:Wicket :: age(v)==7);
+axiom (exists v:Wicket :: age(v)<8);
+
+
+// procedure
+procedure SetToSeven(p: Wicket);
+  modifies favorite
+;
+
+  ensures favorite==p;
+
+implementation SetToSeven(l: Wicket) {
+  favorite:=favorite;
+}
+
+
+