Merging complete. Everything looks good *crosses fingers*

1 files changed, 21 insertions, 21 deletions

diff --git a/Test/test1/EmptyCallArgs.bpl b/Test/test1/EmptyCallArgs.bpl
index 8f5ae31f..3c2aa177 100644
--- a/Test/test1/EmptyCallArgs.bpl
+++ b/Test/test1/EmptyCallArgs.bpl
@@ -1,22 +1,22 @@
-// RUN: %boogie -noVerify "%s" > "%t"

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

-type C;

-

-procedure P(x:int, y:bool) returns (z:C);

-procedure Q<a>(x:int, y:a) returns (z:a);

-

-procedure CallP() {

-  var x:int;

-  var y:bool;

-  var z:C;

-

-  call z := P(x, y);

-}

-

-procedure CallQ() {

-  var x:int;

-  var y:bool;

-  var z:bool;

-

-  call x := Q(x, y);   // type error

+// RUN: %boogie -noVerify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+type C;
+
+procedure P(x:int, y:bool) returns (z:C);
+procedure Q<a>(x:int, y:a) returns (z:a);
+
+procedure CallP() {
+  var x:int;
+  var y:bool;
+  var z:C;
+
+  call z := P(x, y);
+}
+
+procedure CallQ() {
+  var x:int;
+  var y:bool;
+  var z:bool;
+
+  call x := Q(x, y);   // type error
 }
\ No newline at end of file