From f3a13e7cb3d2f0758eb418050d48a240798f2f86 Mon Sep 17 00:00:00 2001
From: David Monniaux <david.monniaux@univ-grenoble-alpes.fr>
Date: Thu, 6 Jun 2019 19:35:07 +0200
Subject: finish merging master branch (fixes problems in glpk colamd)

---
 backend/Selectionaux.ml | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'backend/Selectionaux.ml')

diff --git a/backend/Selectionaux.ml b/backend/Selectionaux.ml
index 818660c1..4e366564 100644
--- a/backend/Selectionaux.ml
+++ b/backend/Selectionaux.ml
@@ -114,9 +114,5 @@ let if_conversion_heuristic cond ifso ifnot ty =
   if !Clflags.option_ffavor_branchless then true else
   if not (fast_cmove ty) then false else
   let c1 = cost_expr ifso and c2 = cost_expr ifnot in
-<<<<<<< HEAD
-  c1 + c2 <= 30 && abs (c1 - c2) <= 8
-=======
   c1 + c2 <= 24 && abs (c1 - c2) <= 8
->>>>>>> ddb2c968e6c57d2117434f169471d87f643d831a
 
-- 
cgit