From 2040b068e620054cf3afa68bceecf0f684c61bad Mon Sep 17 00:00:00 2001
From: hobokenchicken <dustin@dustin.coffee>
Date: Tue, 3 Mar 2026 12:34:39 -0500
Subject: [PATCH] fix: resolve merge conflict in streaming code

---
 src/server/mod.rs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/server/mod.rs b/src/server/mod.rs
index 05361528..a172e8d2 100644
--- a/src/server/mod.rs
+++ b/src/server/mod.rs
@@ -283,10 +283,6 @@ async fn chat_completions(
                 // Many OpenAI-compatible clients expect a terminal [DONE] marker.
                 // Emit it when the upstream stream ends to avoid clients treating
                 // the response as incomplete.
-<<<<<<< HEAD
-                // Convert to a Vec first, then append [DONE], then stream it
-=======
->>>>>>> refs/remotes/origin/main
                 let done_event = Ok::<Event, AppError>(Event::default().data("[DONE]"));
                 let done_stream = futures::stream::iter(vec![done_event]);
                 let out = sse_stream.chain(done_stream);