From e3ba94eb433091c65d3f21a8654330d72e731368 Mon Sep 17 00:00:00 2001
From: lizerk <lizerk-dev@gmail.com>
Date: Fri, 6 Mar 2026 19:01:27 +0300
Subject: [PATCH] =?UTF-8?q?fix:=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD?=
 =?UTF-8?q?=D1=8B=20=D0=BC=D0=B0=D1=80=D0=BA=D0=B5=D1=80=D1=8B=20=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=84=D0=BB=D0=B8=D0=BA=D1=82=D0=B0=20=D0=B8=D0=B7?=
 =?UTF-8?q?=20requirements.txt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/requirements.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/backend/requirements.txt b/backend/requirements.txt
index 58ffe825..e2e28e86 100644
--- a/backend/requirements.txt
+++ b/backend/requirements.txt
@@ -131,8 +131,6 @@ flower>=2.0.1
 
 # Push Notifications
 django-push-notifications==3.1.0
-<<<<<<< HEAD
-=======
 
 # File Management with django-filer
 django-filer==3.4.4
@@ -144,4 +142,3 @@ django-reversion==6.1.0
 
 # Workflow State Machine
 django-fsm==3.0.1
->>>>>>> feature/django-filer-documents