From d652155ae013f36a1ee17653a8e458baad2d9c2c Mon Sep 17 00:00:00 2001
From: Checkmate50 <dgeisler50@gmail.com>
Date: Mon, 6 Jun 2016 23:14:18 -0600
Subject: Merging complete.  Everything looks good *crosses fingers*

---
 Test/test20/Prog1.bpl | 56 +++++++++++++++++++++++++--------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

(limited to 'Test/test20/Prog1.bpl')

diff --git a/Test/test20/Prog1.bpl b/Test/test20/Prog1.bpl
index 7fcf91b6..1c26db31 100644
--- a/Test/test20/Prog1.bpl
+++ b/Test/test20/Prog1.bpl
@@ -1,28 +1,28 @@
-// RUN: %boogie -noVerify "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-// Let's test some Boogie 2 features ...
-
-type elements;
-
-type Field a;
-var heap : <a> [ref, Field a] a;
-
-
-
-procedure p (x:int, y:ref, z:<a> [ref, Field a] a) returns (newHeap : <a> [ref, Field a] a) {
-
-  var f : Field int;
-  var g : Field bool;
-
-  var heap : <a> [ref, Field a] a;
-  
-  assert z[y, f] >= 0;
-  assert z[x, f] >= 0;   // error: x has wrong type
-  assert z[y, x] >= 0;   // error: x has wrong type
-  assert z[y, g] >= 0;   // error: result of map select has wrong type
-
-  heap[y, g] := false;
-
-}
-
-type ref;
+// RUN: %boogie -noVerify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+// Let's test some Boogie 2 features ...
+
+type elements;
+
+type Field a;
+var heap : <a> [ref, Field a] a;
+
+
+
+procedure p (x:int, y:ref, z:<a> [ref, Field a] a) returns (newHeap : <a> [ref, Field a] a) {
+
+  var f : Field int;
+  var g : Field bool;
+
+  var heap : <a> [ref, Field a] a;
+  
+  assert z[y, f] >= 0;
+  assert z[x, f] >= 0;   // error: x has wrong type
+  assert z[y, x] >= 0;   // error: x has wrong type
+  assert z[y, g] >= 0;   // error: result of map select has wrong type
+
+  heap[y, g] := false;
+
+}
+
+type ref;
-- 
cgit v1.2.3