From baf48bc1d81e7f886004b2e82a80cc444e16d394 Mon Sep 17 00:00:00 2001
From: alexander <alexander@ideapad>
Date: Fri, 30 Jan 2026 12:12:01 +0100
Subject: [PATCH] shorted requirements.txt

---
 requirements.txt | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 37b10b8..3c0de06 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,14 +13,7 @@ MarkupSafe==3.0.3
 pydantic==2.12.5
 pydantic-settings==2.12.0
 pydantic_core==2.41.5
-<<<<<<< HEAD
 starlette==0.50.0
-=======
-python-dotenv==1.2.1
-PyYAML==6.0.3
-starlette==0.38.6
-tornado==6.5.4
->>>>>>> 0f1f9e84cbed6b0e9027627cc14355db81c4fa83
 typing-inspection==0.4.2
 typing_extensions==4.15.0
 uvicorn==0.40.0