Projects >> grails-core >>5a41f4089e2f8ad29033993fe0d3dd6519685452

Chunk
Conflicting content 
    public final String grailsVersion;
    public final String servletVersion;
<<<<<<< HEAD
    protected final String groovyVersion = "2.4.0";
    protected final String springVersion = "4.1.4.RELEASE";
=======
    protected final String groovyVersion = "2.3.10";
    protected final String springVersion = "4.0.9.RELEASE";
>>>>>>> 7a585af01ff14d74b82d808a5acffc7fb71e6b09
    protected final String log4jVersion = "1.2.17";
    protected final String h2Version = "1.3.176";
    protected final String jaxbVersion = "2.0";
Solution content 
    public final String grailsVersion;
    public final String servletVersion;
    protected final String groovyVersion = "2.4.0";
    protected final String springVersion = "4.1.4.RELEASE";
    protected final String log4jVersion = "1.2.17";
    protected final String h2Version = "1.3.176";
    protected final String jaxbVersion = "2.0";
File
GrailsCoreDependencies.java
Developer's decision
Version 1
Kind of conflict
Attribute