From 593f4f58810d8c9d1fd51e04dd2f32536898d116 Mon Sep 17 00:00:00 2001 From: Stephen Chang Date: Mon, 31 Oct 2016 12:26:39 -0400 Subject: [PATCH] fix merge remnant --- turnstile/examples/tests/rosette/run-all-rosette-tests.rkt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/turnstile/examples/tests/rosette/run-all-rosette-tests.rkt b/turnstile/examples/tests/rosette/run-all-rosette-tests.rkt index d67c792..1bdc7ec 100644 --- 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