stop tracking state_merged.db (binary merge conflict)

Sync 2026-04-14 06:27
2026-04-14 06:28:17 +00:00 · 2026-04-14 06:27:31 +00:00
2 changed files with 1 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ __pycache__/
 *.db-shm
 *.db-journal
 !state_*.db
 state_merged.db
--- a/state_merged.db
+++ b/state_merged.db
Author	SHA1	Message	Date
Mixer	781526de56	stop tracking state_merged.db (binary merge conflict)	2026-04-14 06:28:17 +00:00
Mixer	1c36b771ff	Sync 2026-04-14 06:27	2026-04-14 06:27:31 +00:00