fix conflicts in merge

rplevy-draker · Mar 20, 2012 · a8c0de3 · a8c0de3
2 parents 9de70ac + 0b0b02c
commit a8c0de3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/History.md b/History.md
@@ -1,6 +1,7 @@
 ## [Git master](https://github.com/cucumber/cucumber-jvm/compare/v1.0.0.RC21...master)
 
 * [Core] Fix broken --tags option (and get rid of JCommander for CLI parsing). ([#266](https://github.com/cucumber/cucumber-jvm/issues/266) Aslak Hellesøy)
+* [Clojure] Make Clojure DSL syntax cleaner ([#244](https://github.com/cucumber/cucumber-jvm/issues/244) [#267](https://github.com/cucumber/cucumber-jvm/pull/267) rplevy-draker)
 * [Clojure] Native Clojure backend ([#138](https://github.com/cucumber/cucumber-jvm/pull/138) [#265](https://github.com/cucumber/cucumber-jvm/pull/265) Kevin Downey, Nils Wloka)
 * [JUnit] Added `format` attribute to `@Cucumber.Options` (Aslak Hellesøy)
 

diff --git a/clojure/src/test/java/cucumber/runtime/clojure/ClojureSnippetTest.java b/clojure/src/test/java/cucumber/runtime/clojure/ClojureSnippetTest.java
@@ -16,6 +16,7 @@ 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);
     }