From 6b2f3a9ad2a8bd7c63d5e179560426a43ecaf9e8 Mon Sep 17 00:00:00 2001
From: Ryan Ernst <ryan@iernst.net>
Date: Sun, 22 Nov 2015 08:51:34 -0800
Subject: [PATCH] Fix bad merge

---
 build.gradle | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index 9ef40c0a5225b..614ff39be291a 100644
--- 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
   }
 }