remove merge conflict markers from .gitignore
This commit is contained in:
parent
88d754b172
commit
482c88cd15
1 changed files with 0 additions and 3 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -60,9 +60,6 @@ cmd/telegram/
|
|||
web/backend/dist/*
|
||||
!web/backend/dist/.gitkeep
|
||||
|
||||
<<<<<<< HEAD
|
||||
.claude/
|
||||
=======
|
||||
|
||||
docker/data
|
||||
>>>>>>> upstream-main
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue