| Chunk |
|---|
| Conflicting content |
|---|
public final String grailsVersion;
public final String servletVersion;
<<<<<<< HEAD
protected final String groovyVersion = "2.2.0-beta-2";
=======
protected final String groovyVersion = "2.1.8-SNAPSHOT";
>>>>>>> 671845cb2d8d0add192baf8b0525108616fef47c
protected final String log4jVersion = "1.2.17";
protected final String h2Version = "1.3.173";
protected final String jaxbVersion = "2.0"; |
| Solution content |
|---|
public final String grailsVersion;
public final String servletVersion;
protected final String groovyVersion = "2.2.0-beta-2";
protected final String log4jVersion = "1.2.17";
protected final String h2Version = "1.3.173";
protected final String jaxbVersion = "2.0"; |
| File |
|---|
| GrailsCoreDependencies.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |