Projects >> nuxeo-core >>38343d3370f211d173618e9a25bb945cdea069d8

Chunk
Conflicting content 
    protected static enum Database {
        DERBY, //
<<<<<<< HEAD
        MYSQL, //
        POSTGRESQL;
    };
=======
        POSTGRESQL
    }
>>>>>>> 3d8c186053e54f3e7a7b2fd6ae03b891fac311ca

    /**
     * Change this to use another SQL database for tests.
Solution content 
    protected static enum Database {
        DERBY, //
        MYSQL, //
        POSTGRESQL
    }

    /**
     * Change this to use another SQL database for tests.
File
SQLBackendHelper.java
Developer's decision
Combination
Kind of conflict
Comment
Enum value