Merge origin/client into main. Resolve binary conflict in commonwealth.db by keeping main's version (latest ticket state). Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -2,6 +2,12 @@
|
||||
.cache/
|
||||
server/target/
|
||||
|
||||
# Godot
|
||||
client/.godot/
|
||||
client/export/
|
||||
client/reports/
|
||||
client/*.import
|
||||
|
||||
# Database journal files (transient, not the DB itself)
|
||||
db/commonwealth.db-wal
|
||||
db/commonwealth.db-shm
|
||||
|
||||
Reference in New Issue
Block a user