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/forro/prog0.forro | 78 +++++++++++++++++++++++++-------------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

(limited to 'Test/forro/prog0.forro')

diff --git a/Test/forro/prog0.forro b/Test/forro/prog0.forro
index cf06e1f9..07966e9d 100644
--- a/Test/forro/prog0.forro
+++ b/Test/forro/prog0.forro
@@ -1,39 +1,39 @@
-procedure a, b, c := P(x, y, z)
-  requires 10
-  ensures 20
-do
-  if 30 then else end;
-  if 31 then else end;
-  while x < z
-    invariant x <= z
-    invariant b.valid and 1
-  do
-    k := x + 1;
-  end;
-  (x+5).head := c.tail;
-  a := new (17, 18);
-  assert a != null;
-  m := k + a + null;
-  c := m;
-  call Q(x, y, y);
-  if x then
-    call a, c, b := P(a, b, c);
-  else
-    call R();
-  end;
-end;
-
-
-procedure Q(x, y, z)
-  requires 10
-  ensures 20
-do
-  if 40 then else end;
-end;
-
-
-procedure R()
-  requires 10
-  ensures 20
-do
-end;
+procedure a, b, c := P(x, y, z)
+  requires 10
+  ensures 20
+do
+  if 30 then else end;
+  if 31 then else end;
+  while x < z
+    invariant x <= z
+    invariant b.valid and 1
+  do
+    k := x + 1;
+  end;
+  (x+5).head := c.tail;
+  a := new (17, 18);
+  assert a != null;
+  m := k + a + null;
+  c := m;
+  call Q(x, y, y);
+  if x then
+    call a, c, b := P(a, b, c);
+  else
+    call R();
+  end;
+end;
+
+
+procedure Q(x, y, z)
+  requires 10
+  ensures 20
+do
+  if 40 then else end;
+end;
+
+
+procedure R()
+  requires 10
+  ensures 20
+do
+end;
-- 
cgit v1.2.3