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/test1/FunBody.bpl | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'Test/test1/FunBody.bpl')

diff --git a/Test/test1/FunBody.bpl b/Test/test1/FunBody.bpl
index fc566681..caaf06f5 100644
--- a/Test/test1/FunBody.bpl
+++ b/Test/test1/FunBody.bpl
@@ -1,15 +1,15 @@
-// RUN: %boogie -noVerify "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-function g0<beta>(x:beta) returns (beta);
-function g1<beta>() returns (beta);
-
-function {:inline true} f1() returns (int) { 13 }
-function {:inline true} f2() returns (int) { true }                  // wrong type
-function {:inline true} f3<alpha>(x:alpha) returns (alpha) { g0(x) }
-function {:inline true} f4<alpha>(x:alpha) returns (alpha) { g0(5) } // wrong type
-function {:inline true} f5<alpha>() returns (alpha) { g1() }
-function {:inline true} f6<alpha>() returns (alpha) { g1():int }     // wrong type
-
-
-
+// RUN: %boogie -noVerify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+function g0<beta>(x:beta) returns (beta);
+function g1<beta>() returns (beta);
+
+function {:inline true} f1() returns (int) { 13 }
+function {:inline true} f2() returns (int) { true }                  // wrong type
+function {:inline true} f3<alpha>(x:alpha) returns (alpha) { g0(x) }
+function {:inline true} f4<alpha>(x:alpha) returns (alpha) { g0(5) } // wrong type
+function {:inline true} f5<alpha>() returns (alpha) { g1() }
+function {:inline true} f6<alpha>() returns (alpha) { g1():int }     // wrong type
+
+
+
-- 
cgit v1.2.3