fix: resolve Cargo.toml merge conflict markers; regenerate Cargo.lock

The squash merge of #595 (sonic-ct) onto the rebased #566 (emergent-time)
left unresolved conflict markers in Cargo.toml. Both crates are now
correctly listed in the workspace exclude array.
Also regenerates Cargo.lock to include both new crates.

Co-Authored-By: claude-flow <ruv@ruv.net>

Author: ruvnet

Cargo.lock

@@ -1,15 +1,9 @@
 [workspace]
 exclude = ["external/ruqu", "external/rvdna", "examples/OSpipe", "examples/rvf", "crates/micro-hnsw-wasm", "crates/ruvector-hyperbolic-hnsw", "crates/ruvector-hyperbolic-hnsw-wasm", "examples/ruvLLM/esp32", "examples/ruvLLM/esp32-flash", "examples/edge-net", "examples/data", "examples/ruvLLM", "examples/delta-behavior", "crates/rvf", "crates/rvf/*", "crates/rvf/*/*", "examples/rvf-desktop", "crates/mcp-brain-server",
-<<<<<<< HEAD
-    # emergent-time-wasm is a standalone cdylib with its own size-optimized
-    # `[profile.release]` (opt-level="z") and a `panic = "abort"` profile for a
-    # tiny wasm; excluded so it does not override the workspace opt-level=3.
+    # emergent-time-wasm: standalone cdylib with own opt-level=z, panic=abort
     "crates/emergent-time-wasm",
-=======
-    # sonic-ct crates are self-contained detached workspaces (own [workspace]
-    # tables) so their native + wasm builds stay fast and dependency-free.
+    # sonic-ct crates: self-contained detached workspaces
     "crates/sonic-ct", "crates/sonic-ct-wasm",
->>>>>>> 9a0d2f196 (feat(sonic_ct): acoustic digital human workbench — Rust/WASM USCT + R3F UI)
     # ruvector-postgres is a pgrx-based PostgreSQL extension. Its build script
     # requires `$PGRX_HOME` set up via `cargo install cargo-pgrx --version 0.12.9`
     # and `cargo pgrx init`, which downloads and builds multiple Postgres