Merging complete. Everything looks good *crosses fingers*

1 files changed, 16 insertions, 16 deletions

diff --git a/Test/test20/ProcParamReordering.bpl b/Test/test20/ProcParamReordering.bpl
index 2532964f..225eed33 100644
--- a/Test/test20/ProcParamReordering.bpl
+++ b/Test/test20/ProcParamReordering.bpl
@@ -1,17 +1,17 @@
-// RUN: %boogie -noVerify "%s" > "%t"

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

-

-type C _;

-

-

-procedure P<a, b>(x : a, y : b) returns ();

-

-implementation P<a, b>(x : a, y : b) returns () {}

-

-implementation P<c, d>(a : c, b : d) returns () {}

-

-implementation P<d, c>(a : c, b : d) returns () {}

-

-implementation P<d, c>(a : c, b : C d) returns () {}

-

+// RUN: %boogie -noVerify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+type C _;
+
+
+procedure P<a, b>(x : a, y : b) returns ();
+
+implementation P<a, b>(x : a, y : b) returns () {}
+
+implementation P<c, d>(a : c, b : d) returns () {}
+
+implementation P<d, c>(a : c, b : d) returns () {}
+
+implementation P<d, c>(a : c, b : C d) returns () {}
+
 implementation P<a>(x : a, y : a) returns () {}
\ No newline at end of file