Projects >> nuxeo-runtime >>12e032f971b4b9ecab5e4cca18813b1ce8271c72

Chunk
Conflicting content 
        // Windows path
        propertyToGenerate2 = "URL=jdbc:h2:"
<<<<<<< HEAD
                + "C:\\nuxeo-dm-5.4.3-SNAPSHOT-jboss\\server\\default\\data\\NXRuntime\\data"
=======
                + "C:\\nuxeo-dm-jboss\\server\\default\\data\\NXRuntime\\data"
>>>>>>> 1f3ccd39b07df413e2eb31b25f5c25f619afd73c
                + File.separator + "h2" + File.separator
                + "testinclude;AUTO_SERVER=true";
Solution content 
        // Windows path
        propertyToGenerate2 = "URL=jdbc:h2:"
                + "C:\\nuxeo-dm-jboss\\server\\default\\data\\NXRuntime\\data"
                + File.separator + "h2" + File.separator
                + "testinclude;AUTO_SERVER=true";
File
JBossConfiguratorTest.java
Developer's decision
Version 2
Kind of conflict
Other