remove accidentally left in git artifact

rplevy-draker · Mar 20, 2012 · 504e4f6 · 504e4f6
1 parent a8c0de3
commit 504e4f6
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/clojure/src/test/java/cucumber/runtime/clojure/ClojureSnippetTest.java b/clojure/src/test/java/cucumber/runtime/clojure/ClojureSnippetTest.java
@@ -16,7 +16,6 @@ public void generatesPlainSnippet() {
         String snippet = new SnippetGenerator(new ClojureSnippet()).getSnippet(step);
         String expected = "" +
                 "(Given #\"^I have (\\d+) cukes in my \"([^\"]*)\" belly$\" [arg1, arg2]\n" +
-<<<<<<< HEAD
                 "  (comment  Express the Regexp above with the code you wish you had  ))\n";
         assertEquals(expected, snippet);
     }