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

---
 powerpc/SelectOp.vp | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

(limited to 'powerpc/SelectOp.vp')

diff --git a/powerpc/SelectOp.vp b/powerpc/SelectOp.vp
index 07c325c1..50b1bdd6 100644
--- a/powerpc/SelectOp.vp
+++ b/powerpc/SelectOp.vp
@@ -38,17 +38,8 @@
 
 Require Import Coqlib.
 Require Import Compopts.
-<<<<<<< HEAD
-Require Import AST.
-Require Import Integers.
-Require Import Floats.
-Require Import Op.
-Require Import CminorSel.
-Require Import OpHelpers.
-=======
 Require Import AST Integers Floats Builtins.
-Require Import Op CminorSel.
->>>>>>> 91381b65f5aa76e5195caae9ef331b3f5f95afaf
+Require Import Op OpHelpers CminorSel.
 Require Archi.
 
 Local Open Scope cminorsel_scope.
@@ -573,16 +564,14 @@ Nondetfunction builtin_arg (e: expr) :=
   | _ => BA e
   end.
 
-<<<<<<< HEAD
 (* floats *)
 Definition divf_base (e1: expr) (e2: expr) :=
   Eop Odivf (e1 ::: e2 ::: Enil).
 
 Definition divfs_base (e1: expr) (e2: expr) :=
   Eop Odivfs (e1 ::: e2 ::: Enil).
-=======
+
 (** Platform-specific known builtins *)
 
 Definition platform_builtin (b: platform_builtin) (args: exprlist) : option expr :=
   None.
->>>>>>> 91381b65f5aa76e5195caae9ef331b3f5f95afaf
-- 
cgit