From 94f0736f3745a001f621cb6d272fba0fd9be7dc7 Mon Sep 17 00:00:00 2001
From: SachaMorard <2254275+SachaMorard@users.noreply.github.com>
Date: Fri, 6 Mar 2026 15:12:18 +0100
Subject: [PATCH] fixup: readme

---
 README.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/README.md b/README.md
index 5a7934d9..8a3c8b8d 100644
--- a/README.md
+++ b/README.md
@@ -25,11 +25,7 @@ use edgee::Edgee;
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let client = Edgee::from_env()?;
 
-<<<<<<< HEAD
-    let response = client.send("gpt-5.2", "What is the capital of France?").await?;
-=======
     let response = client.send("anthropic/claude-haiku-4-5", "What is the capital of France?").await?;
->>>>>>> c2093a9 (feat: update compression response to new API format)
     println!("{}", response.text().unwrap_or(""));
     // "The capital of France is Paris."
 
@@ -71,7 +67,6 @@ The `stream()` method enables real-time streaming responses:
 ```rust
 use tokio_stream::StreamExt;
 
-<<<<<<< HEAD
 let mut stream = client.stream("anthropic/claude-haiku-4-5", "Tell me a story").await?;
 
 while let Some(result) = stream.next().await {