Updated core to 1.1.31

serenity-bdd · Apr 20, 2016 · 7aa003c · 7aa003c
1 parent 3384e62
commit 7aa003c
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/build.gradle b/build.gradle
@@ -44,7 +44,6 @@ ext {
     if (!project.hasProperty("bintrayApiKey")) {
         bintrayApiKey = ''
     }
-<<<<<<< HEAD
     serenityCoreVersion = '1.1.31'
     cucumberJVMVersion = '1.2.4'