Merging complete. Everything looks good *crosses fingers*

1 files changed, 39 insertions, 39 deletions

diff --git a/Test/test2/AssertVerifiedUnder0.bpl b/Test/test2/AssertVerifiedUnder0.bpl
index 9e82545f..76d7660e 100644
--- a/Test/test2/AssertVerifiedUnder0.bpl
+++ b/Test/test2/AssertVerifiedUnder0.bpl
@@ -1,39 +1,39 @@
-// RUN: %boogie -noinfer "%s" > "%t"

-// RUN: %diff "%s.expect" "%t"

-

-procedure Test0()

-{

-    assert {:verified_under false} false;  // error

-}

-

-

-procedure Test1()

-{

-    assert {:verified_under true} false;

-}

-

-

-procedure Test2(P: bool, A: bool)

-{

-    assert {:verified_under A} P;  // error

-}

-

-

-procedure Test3(P: bool, A: bool)

-  requires !A ==> P;

-{

-    assert {:verified_under A} P;

-}

-

-

-procedure Test4(P: bool, A: bool)

-{

-    assert {:verified_under A} {:verified_under true} P;  // error

-}

-

-

-procedure Test5(P: bool, A: bool)

-  requires !A ==> P;

-{

-    assert {:verified_under A} {:verified_under true} P;

-}

+// RUN: %boogie -noinfer "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+procedure Test0()
+{
+    assert {:verified_under false} false;  // error
+}
+
+
+procedure Test1()
+{
+    assert {:verified_under true} false;
+}
+
+
+procedure Test2(P: bool, A: bool)
+{
+    assert {:verified_under A} P;  // error
+}
+
+
+procedure Test3(P: bool, A: bool)
+  requires !A ==> P;
+{
+    assert {:verified_under A} P;
+}
+
+
+procedure Test4(P: bool, A: bool)
+{
+    assert {:verified_under A} {:verified_under true} P;  // error
+}
+
+
+procedure Test5(P: bool, A: bool)
+  requires !A ==> P;
+{
+    assert {:verified_under A} {:verified_under true} P;
+}