Merging complete. Everything looks good *crosses fingers*

1 files changed, 10 insertions, 10 deletions

diff --git a/Test/test0/Types0.bpl b/Test/test0/Types0.bpl
index 62385acf..d606951b 100644
--- a/Test/test0/Types0.bpl
+++ b/Test/test0/Types0.bpl
@@ -1,10 +1,10 @@
-// RUN: %boogie -noVerify "%s" > "%t"

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

-type T, U;

-type V;

-

-function f([U,V]T, int) returns (U);

-function g(x: [U,V]T, y: int) returns (z: U);

-function h([U,V]T: int, y: int) returns (z: U);  // parse error

-function k(T: int, y: int) returns (U: [any]int);

-function l(x) returns (int);  // resolve error

+// RUN: %boogie -noVerify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+type T, U;
+type V;
+
+function f([U,V]T, int) returns (U);
+function g(x: [U,V]T, y: int) returns (z: U);
+function h([U,V]T: int, y: int) returns (z: U);  // parse error
+function k(T: int, y: int) returns (U: [any]int);
+function l(x) returns (int);  // resolve error