remove merge conflict markers from .gitignore

This commit is contained in:
Administrator 2026-03-22 13:48:03 +08:00
parent 88d754b172
commit 482c88cd15

3
.gitignore vendored
View file

@ -60,9 +60,6 @@ cmd/telegram/
web/backend/dist/*
!web/backend/dist/.gitkeep
<<<<<<< HEAD
.claude/
=======
docker/data
>>>>>>> upstream-main