| Chunk |
|---|
| Conflicting content |
|---|
// dependencies needed at compile time
ModuleRevisionId[] groovyDependencies = {
<<<<<<< HEAD
ModuleRevisionId.newInstance("org.codehaus.groovy", "groovy-all", "2.0.7")
=======
ModuleRevisionId.newInstance("org.codehaus.groovy", "groovy-all", "1.8.8")
>>>>>>> 2a7930adb17aea780207c8e1f80b3a8b8ae0b0b8
};
registerDependencies(dependencyManager, compileTimeDependenciesMethod, groovyDependencies, "jline");
|
| Solution content |
|---|
// dependencies needed at compile time
ModuleRevisionId[] groovyDependencies = {
ModuleRevisionId.newInstance("org.codehaus.groovy", "groovy-all", "2.0.7")
};
registerDependencies(dependencyManager, compileTimeDependenciesMethod, groovyDependencies, "jline");
|
| File |
|---|
| GrailsCoreDependencies.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |