From 4c379d48b35e7c8156f3953fede31d5e47faf8ca Mon Sep 17 00:00:00 2001
From: David Monniaux <david.monniaux@univ-grenoble-alpes.fr>
Date: Fri, 19 Jul 2019 18:59:44 +0200
Subject: helpers broke compilation

---
 extraction/extraction.v | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'extraction')

diff --git a/extraction/extraction.v b/extraction/extraction.v
index 5a1ca0be..caf4330b 100644
--- a/extraction/extraction.v
+++ b/extraction/extraction.v
@@ -34,11 +34,6 @@ Require Clight.
 Require Compiler.
 Require Parser.
 Require Initializers.
-<<<<<<< HEAD
-Require Int31.
-Require Asmaux.
-=======
->>>>>>> 91381b65f5aa76e5195caae9ef331b3f5f95afaf
 
 (* Standard lib *)
 Require Import ExtrOcamlBasic.
-- 
cgit