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/Prog2.bpl | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

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

diff --git a/Test/test20/Prog2.bpl b/Test/test20/Prog2.bpl
index 79555d28..67d9396e 100644
--- a/Test/test20/Prog2.bpl
+++ b/Test/test20/Prog2.bpl
@@ -1,18 +1,18 @@
-// RUN: %boogie -noVerify "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-function union(<a> [a] bool, <a> [a] bool) returns (<a> [a] bool);
-
-axiom (forall<alpha>             // error: alpha has to occur in dummy types
-              x : <a> [a] bool, y : <a> [a] bool,
-              z : int ::
-              { union(x, y)[z] } 
-              union(x, y)[z] == (x[z] || y[z]));
-
-function poly<a>() returns (a);
-
-axiom (forall<alpha>
-              x : <a> [a] bool, y : <a> [a] bool,
-              z : int ::
-              { union(x, y)[z], poly() : alpha } 
-              union(x, y)[z] == (x[z] || y[z]));
-
+// RUN: %boogie -noVerify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+function union(<a> [a] bool, <a> [a] bool) returns (<a> [a] bool);
+
+axiom (forall<alpha>             // error: alpha has to occur in dummy types
+              x : <a> [a] bool, y : <a> [a] bool,
+              z : int ::
+              { union(x, y)[z] } 
+              union(x, y)[z] == (x[z] || y[z]));
+
+function poly<a>() returns (a);
+
+axiom (forall<alpha>
+              x : <a> [a] bool, y : <a> [a] bool,
+              z : int ::
+              { union(x, y)[z], poly() : alpha } 
+              union(x, y)[z] == (x[z] || y[z]));
+
-- 
cgit v1.2.3