merge json

1 files changed, 1 insertions, 6 deletions

diff --git a/build.gradle b/build.gradle
index f2bc16ab..3a6a3612 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 subprojects {
     apply plugin: 'java'
     repositories {
@@ -18,14 +17,13 @@ buildscript {
         classpath 'com.tkruse.gradle:gradle-groovysh-plugin:1.0.8'
     }
 }
-
+apply plugin: 'java'
 apply plugin: 'war'
 apply plugin: 'css'
 apply plugin: 'org.akhikhl.gretty'
 apply plugin: 'com.eriwen.gradle.js'
 apply plugin: 'com.github.tkruse.groovysh'
 
-
 repositories {
     mavenCentral()
 }
@@ -118,6 +116,3 @@ gretty {
     contextPath = ''
     servletContainer = 'tomcat8'
 }
-=======
-apply plugin: "java"
->>>>>>> core/develop