diff options
Diffstat (limited to 'makima/src/server')
| -rw-r--r-- | makima/src/server/handlers/contract_chat.rs | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/makima/src/server/handlers/contract_chat.rs b/makima/src/server/handlers/contract_chat.rs index a0708da..28c3436 100644 --- a/makima/src/server/handlers/contract_chat.rs +++ b/makima/src/server/handlers/contract_chat.rs @@ -1751,8 +1751,6 @@ async fn handle_contract_request( }; } -<<<<<<< HEAD -======= // Check if deliverables are met before allowing transition let cwr = match get_contract_with_relations(pool, contract_id, owner_id).await { Ok(Some(c)) => c, @@ -1812,7 +1810,6 @@ async fn handle_contract_request( }; } ->>>>>>> c6507b4 (feat: Add deliverables checking and auto-progress for contract phases) // Check if phase_guard is enabled if contract.phase_guard { // If user provided feedback, return it for the task to address @@ -2074,8 +2071,6 @@ async fn handle_contract_request( } } -<<<<<<< HEAD -======= ContractToolRequest::CheckDeliverablesMet => { match get_contract_with_relations(pool, contract_id, owner_id).await { Ok(Some(cwr)) => { @@ -2152,7 +2147,6 @@ async fn handle_contract_request( } } ->>>>>>> c6507b4 (feat: Add deliverables checking and auto-progress for contract phases) // ============================================================================= // Task Derivation Handlers // ============================================================================= |