honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-24 17:09:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bad merge

Browse Source
This commit is contained in:
Ryan Ernst 2015-11-22 08:51:34 -08:00
parent 8e2b670b28
commit 6b2f3a9ad2
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build.gradle
View File

@ -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
}
}