fix merge remnant

2016-10-31 12:26:39 -04:00 · 2016-10-31 12:26:39 -04:00 · 593f4f5881
commit 593f4f5881
parent 3edf1e031a
1 changed files with 0 additions and 4 deletions
--- a/turnstile/examples/tests/rosette/run-all-rosette-tests.rkt
+++ b/turnstile/examples/tests/rosette/run-all-rosette-tests.rkt
@ -8,11 +8,7 @@
 ;(require "bv-ref-tests.rkt")
 ; visit but dont instantiate, o.w. will get unsat
 ;(dynamic-require "fsm-test.rkt" #f)
-<<<<<<< HEAD
 (require "ifc-tests.rkt")

 ; don't run this file for testing:
 (module test racket/base)
-=======
-;(require "ifc-tests.rkt")
->>>>>>> add optimize, remaining sec3 tests; fix CList-CListof subtyping