diff options
| author | soryu <soryu@soryu.co> | 2026-02-03 23:19:40 +0000 |
|---|---|---|
| committer | soryu <soryu@soryu.co> | 2026-02-03 23:19:40 +0000 |
| commit | bfa3af9ef16fd5e255bdb606a99a5ebb535ba7cc (patch) | |
| tree | 53da855b4ca61a5c0856fc15112daa7a3748c637 /makima/src/daemon/mod.rs | |
| parent | 1ce281adb89683a5fccfd153706383b14b944f32 (diff) | |
| parent | dcbf8c834626870a43b633b099f409d69d4f9b87 (diff) | |
| download | soryu-bfa3af9ef16fd5e255bdb606a99a5ebb535ba7cc.tar.gz soryu-bfa3af9ef16fd5e255bdb606a99a5ebb535ba7cc.zip | |
fix: Resolve merge conflict in server/mod.rsmakima/discuss-contract-feature
Combine imports from both branches - include both chains and contract_discuss handlers.
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Diffstat (limited to 'makima/src/daemon/mod.rs')
| -rw-r--r-- | makima/src/daemon/mod.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/makima/src/daemon/mod.rs b/makima/src/daemon/mod.rs index f5793d6..62da20e 100644 --- a/makima/src/daemon/mod.rs +++ b/makima/src/daemon/mod.rs @@ -8,6 +8,7 @@ //! - `makima view` - Interactive TUI browser for tasks, contracts, and files pub mod api; +pub mod chain; pub mod cli; pub mod config; pub mod db; |