From c7056d200dad536635bf7bf2c769f875d2238e04 Mon Sep 17 00:00:00 2001
From: Lesenechal Remi <lesenechal.remi@gmail.com>
Date: Sun, 27 Oct 2019 13:57:26 +0100
Subject: [PATCH] merging with dev

---
 src/test/integration_tests.ml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/test/integration_tests.ml b/src/test/integration_tests.ml
index 992c21d4a..dbd388cdd 100644
--- a/src/test/integration_tests.ml
+++ b/src/test/integration_tests.ml
@@ -658,14 +658,8 @@ let loop () : unit result =
     let make_input = e_nat in
     let make_expected = fun n -> e_nat (n * (n + 1) / 2) in
     expect_eq_n_pos_mid program "while_sum" make_input make_expected
-<<<<<<< HEAD
-  in(* For loop is currently unsupported
-
-  let%bind () =
-=======
   in
   let%bind () = 
->>>>>>> First version for ForInt loops
     let make_input = e_nat in
     let make_expected = fun n -> e_int (n * (n + 1) / 2) in
     expect_eq_n_pos_mid program "for_sum" make_input make_expected