Riley Schneider
|
ec0abd85b9
|
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
|
2025-12-03 18:20:36 +01:00 |
|
