fix(brain): resolve merge conflict markers in Cargo.toml and Cargo.lock

Unresolved <<<<<<< / ======= / >>>>>>> markers blocked all CI
(cargo check, clippy, rustfmt, tests, security audit, native builds).

Keep both sides: ruvbrain-sse + ruvbrain-worker bins from upstream
and the new mcp-brain-server-local bin from this branch. Lock file
retains both ruvector-consciousness and rusqlite dependencies.

Co-Authored-By: claude-flow <ruv@ruv.net>
This commit is contained in:
ruvnet 2026-04-20 13:14:11 -04:00
parent 8bb65747f8
commit 3cc36e2489
2 changed files with 3 additions and 7 deletions

5
Cargo.lock generated
View file

@ -5258,11 +5258,8 @@ dependencies = [
"rand 0.8.5",
"regex",
"reqwest 0.12.28",
<<<<<<< Updated upstream
"ruvector-consciousness",
=======
"rusqlite",
>>>>>>> Stashed changes
"ruvector-consciousness",
"ruvector-delta-core",
"ruvector-domain-expansion",
"ruvector-mincut 2.1.0",

View file

@ -13,18 +13,17 @@ name = "mcp-brain-server"
path = "src/main.rs"
[[bin]]
<<<<<<< Updated upstream
name = "ruvbrain-sse"
path = "src/bin/ruvbrain_sse.rs"
[[bin]]
name = "ruvbrain-worker"
path = "src/bin/ruvbrain_worker.rs"
=======
[[bin]]
name = "mcp-brain-server-local"
path = "src/bin/local.rs"
required-features = ["local"]
>>>>>>> Stashed changes
[dependencies]
# Web framework