Merging complete. Everything looks good *crosses fingers*

1 files changed, 13 insertions, 13 deletions

diff --git a/Test/test21/NameClash.bpl b/Test/test21/NameClash.bpl
index d31a6e01..59f361a8 100644
--- a/Test/test21/NameClash.bpl
+++ b/Test/test21/NameClash.bpl
@@ -1,14 +1,14 @@
-// RUN: %boogie -typeEncoding:n -logPrefix:0n "%s" > "%t"

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

-// RUN: %boogie -typeEncoding:p -logPrefix:0p "%s" > "%t"

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

-// RUN: %boogie -typeEncoding:a -logPrefix:0a "%s" > "%t"

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

-

-

-function f(int) returns (int);

-axiom f(13) == 0;

-

-procedure P() returns () {

-  assert (exists f:int :: 0 == f(f));

+// RUN: %boogie -typeEncoding:n -logPrefix:0n "%s" > "%t"
+// RUN: %diff "%s.n.expect" "%t"
+// RUN: %boogie -typeEncoding:p -logPrefix:0p "%s" > "%t"
+// RUN: %diff "%s.p.expect" "%t"
+// RUN: %boogie -typeEncoding:a -logPrefix:0a "%s" > "%t"
+// RUN: %diff "%s.a.expect" "%t"
+
+
+function f(int) returns (int);
+axiom f(13) == 0;
+
+procedure P() returns () {
+  assert (exists f:int :: 0 == f(f));
 }
\ No newline at end of file