.copier/backend.yml

@@ -1,4 +1,4 @@
-_commit: v0.1.0
+_commit: v0.3.0
 _src_path: https://git.kotikot.com/templates/blank.git
 layout: part
 part: backend

backend/Makefile

@@ -1,10 +1,15 @@
 COMPOSE := cd .. && docker compose
+<<<<<<< before updating
 IMAGE := lodge/backend
 LINT := go run github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.13.2
 changed = ! git diff --quiet $(1) -- $(2) 2>/dev/null
 stamp = { git update-ref $(1) HEAD 2>/dev/null || true; }
 
 .PHONY: fmt check test build pre-deploy post-deploy client dev
+=======
+
+.PHONY: fmt check build
+>>>>>>> after updating
 
 fmt:
 	go mod tidy
@@ -19,6 +24,7 @@ test:
 
 build:
 	$(COMPOSE) build api
+<<<<<<< before updating
 
 pre-deploy:
 	@if $(call changed,refs/deploy/backend,.) || ! docker image inspect $(IMAGE) >/dev/null 2>&1; then \
@@ -33,3 +39,5 @@ client:
 
 dev:
 	LODGE_DB=storage/lodge.db STATIC_DIR=../frontend/build CLIENTS_DIR=bin ADMIN_TOKEN=dev go run ./cmd/lodge-server
+=======
+>>>>>>> after updating