1 files changed, 4 insertions, 0 deletions
diff --git a/build.gradle b/build.gradle
index ea42cc55..f2bc16ab 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 subprojects {
     apply plugin: 'java'
     repositories {
@@ -117,3 +118,6 @@ gretty {
     contextPath = ''
     servletContainer = 'tomcat8'
 }
+=======
+apply plugin: "java"
+>>>>>>> core/develop