Merge remote-tracking branch 'origin/database' into database
# Conflicts: # .gradle/8.14/executionHistory/executionHistory.lock # .gradle/8.14/fileHashes/fileHashes.bin # .gradle/8.14/fileHashes/fileHashes.lock # .gradle/buildOutputCleanup/buildOutputCleanup.lock # .gradle/buildOutputCleanup/cache.properties # build/classes/java/main/hhn/temp/project/provider/DatabaseManager.class # build/tmp/compileJava/previous-compilation-data.bin # src/main/java/hhn/temp/project/provider/SimpleDatabaseManager.java # test/hhn/temp/project/BadCasesTest.java # test/hhn/temp/project/DatabaseBadCasesTest.java # test/hhn/temp/project/DatabaseGoodCasesTest.java # test/hhn/temp/project/GoodCasesTest.java
This commit is contained in:
BIN
.gradle/buildOutputCleanup/outputFiles.bin
Normal file
BIN
.gradle/buildOutputCleanup/outputFiles.bin
Normal file
Binary file not shown.
Reference in New Issue
Block a user