merge: resolve .gitignore conflict, keep both entries

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-13 07:22:45 -04:00
parent a084819889 66b3aeafc1
commit c68139e15e
70 changed files with 4008 additions and 795 deletions
@@ -201,3 +201,6 @@ FakesAssemblies/

 # Git worktrees
 .worktrees/
+
+# Claude Code
+.claude/