fixed another merge conflict

draperlaboratory · Oct 31, 2019 · fab352a · fab352a
1 parent d378cb0
commit fab352a
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/wp/lib/bap_wp/src/precondition.ml b/wp/lib/bap_wp/src/precondition.ml
@@ -835,12 +835,8 @@ let check ?refute:(refute = true) (solver : Solver.solver) (ctx : Z3.context)
     else
       pre'
   in
-<<<<<<< HEAD
-  Solver.check solver [is_correct]
-=======
   let () = Z3.Solver.add solver [is_correct] in
   Z3.Solver.check solver []
->>>>>>> 874382e... Tests and simple mem-model extractor for gdb
 
 let exclude (solver : Solver.solver) (ctx : Z3.context) ~var:(var : Constr.z3_expr)
     ~pre:(pre : Constr.t) : Solver.status =