Fix bad merge

bleskes · Nov 22, 2015 · 6b2f3a9 · 6b2f3a9
1 parent 8e2b670
commit 6b2f3a9
Showing 1 changed file with 1 addition and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -163,19 +163,10 @@ allprojects {
   apply plugin: 'idea'
 }
 
-<<<<<<< HEAD
-if (projectsPrefix.isEmpty()) {
-  idea {
-    project {
-      languageLevel = org.elasticsearch.gradle.BuildPlugin.minimumJava.toString()
-      vcs = 'Git'
-    }
-=======
 idea {
   project {
-    languageLevel = org.elasticsearch.gradle.BuildPlugin.minimumJava
+    languageLevel = org.elasticsearch.gradle.BuildPlugin.minimumJava.toString()
     vcs = 'Git'
->>>>>>> Build: Change project attachment into special extra-plugins dir
   }
 }