Merging complete. Everything looks good *crosses fingers*

1 files changed, 11 insertions, 11 deletions

diff --git a/Test/inline/expansion4.bpl b/Test/inline/expansion4.bpl
index 1c1ff51c..cfd0672d 100644
--- a/Test/inline/expansion4.bpl
+++ b/Test/inline/expansion4.bpl
@@ -1,11 +1,11 @@
-// RUN: %boogie "%s" > "%t"

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

-function foo(x:int) : int

-  { if x <= 0 then 1 else foo(x - 1) + 2 }

-

-procedure bar()

-{

-  assert foo(0) == 1;

-  assert foo(1) == 3;

-  assert foo(2) == 5;

-}

+// RUN: %boogie "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+function foo(x:int) : int
+  { if x <= 0 then 1 else foo(x - 1) + 2 }
+
+procedure bar()
+{
+  assert foo(0) == 1;
+  assert foo(1) == 3;
+  assert foo(2) == 5;
+}