chore(backend,infra): resolve template update conflicts, import check knows the watcher and the api login
This commit is contained in:
1 parent
9e672623ac
commit
4945c7cbd3
27 files changed
+27
-82
No files matched your search
@@ -1,13 +1,4 @@
|
||||
COMPOSE := cd .. && docker compose
|
||||
<<<<<<< before updating
|
||||
IMAGE := beavergram/backend
|
||||
IMAGE_INPUTS := pyproject.toml uv.lock Dockerfile
|
||||
CODE := src scripts ../frontend
|
||||
SERVICES := api userbot watcher
|
||||
changed = ! git diff --quiet $(1) -- $(2) 2>/dev/null
|
||||
stamp = { git update-ref $(1) HEAD 2>/dev/null || true; }
|
||||
=======
|
||||
>>>>>>> after updating
|
||||
|
||||
.PHONY: fmt check build migrate revision session
|
||||
|
||||
|
||||
Reference in new issue
Block a user