Add conflict resolution diff UI and app branding

2026-05-13 16:25:28 -04:00
parent 780ff3a02c
commit d359baa010
83 changed files with 4523 additions and 3735 deletions
--- a/apps/server/.air.toml
+++ b/apps/server/.air.toml
@@ -7,10 +7,10 @@ tmp_dir = "tmp"

 [build]
  args_bin = []
-  bin = "./bin/md-hub-secure"
-  cmd = "CGO_ENABLED=1 go build -trimpath -o bin/md-hub-secure ./cmd/md-hub-secure"
+  bin = "./bin/cairnquire"
+  cmd = "CGO_ENABLED=1 go build -trimpath -o bin/cairnquire ./cmd/cairnquire"
  delay = 500
-  entrypoint = ["./bin/md-hub-secure"]
+  entrypoint = ["./bin/cairnquire"]
  exclude_dir = ["assets", "tmp", "vendor", "testdata", "bin"]
  exclude_file = []
  exclude_regex = ["_test.go"]