clean up sync-conflict files, add .gitignore

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-10 16:56:20 +01:00
parent 65bd53489a
commit 36eb002397
5 changed files with 2 additions and 0 deletions
--- a/.DS_Store
+++ b/.DS_Store
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.DS_Store
+.sync-conflict-*
--- a/.sync-conflict-20260301-014345-HBWUQZ5.DS_Store
+++ b/.sync-conflict-20260301-014345-HBWUQZ5.DS_Store
--- a/.sync-conflict-20260301-014346-HBWUQZ5.DS_Store
+++ b/.sync-conflict-20260301-014346-HBWUQZ5.DS_Store
--- a/.sync-conflict-20260301-092732-HBWUQZ5.DS_Store
+++ b/.sync-conflict-20260301-092732-HBWUQZ5.DS_Store