Projects >> sqlcipher-android-tests >>241c3aa8b751ba30c958190f23d75c67e741a7fc

Chunk
Conflicting content 
        tests.add(new MigrationUserVersion());
        tests.add(new ExportToUnencryptedDatabase());
        tests.add(new QueryNonEncryptedDatabaseTest());
<<<<<<< HEAD
        tests.add(new EnableForeignKeySupportTest());
        tests.add(new AverageOpenTimeTest());
=======
        tests.add(new RawRekeyTest());
>>>>>>> 3d36f7e8547c4f033c34583776f22d1b7eb9a9d7
        return tests;
    }
}
Solution content 
        tests.add(new MigrationUserVersion());
        tests.add(new ExportToUnencryptedDatabase());
        tests.add(new QueryNonEncryptedDatabaseTest());
        tests.add(new EnableForeignKeySupportTest());
        tests.add(new AverageOpenTimeTest());
        tests.add(new RawRekeyTest());
        return tests;
    }
}
File
TestSuiteRunner.java
Developer's decision
Concatenation
Kind of conflict
Method invocation