fix broken merge

grails · Jul 28, 2015 · 481a300 · 481a300
1 parent 67f66a5
commit 481a300
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/grails-bootstrap/src/main/groovy/grails/util/BuildSettings.groovy b/grails-bootstrap/src/main/groovy/grails/util/BuildSettings.groovy
@@ -17,15 +17,6 @@ package grails.util
 
 import grails.io.IOUtils
 
-<<<<<<< HEAD
-=======
-import grails.build.logging.GrailsConsole
-import org.codehaus.groovy.grails.cli.fork.ForkedGrailsProcess
-
-import groovy.transform.CompileStatic
-
-import java.util.concurrent.ConcurrentHashMap
->>>>>>> 2.5.x
 import java.util.regex.Pattern
 
 /**