opencode/picoclaw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove merge conflict markers from .gitignore

Browse source
This commit is contained in:
Administrator 2026-03-22 13:48:03 +08:00
parent 88d754b172
commit 482c88cd15
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

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