From f14b2390439f2deb71f0b51ef94b74ca2f254d16 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Thu, 12 Jan 2023 17:19:19 -0500
Subject: [PATCH] fix merge error

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

diff --git a/requirements.txt b/requirements.txt
index 2f77d86e..75925352 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,12 +10,8 @@ django-user-messages
 django-slack
 django-ninja
 django-polymorphic
-<<<<<<< HEAD
 django-maintenance-mode
-=======
-django-debug-toolbar
 django-tz-detect
->>>>>>> 1a1c053 (user may change mark date)
 meilisearch
 easy-thumbnails
 lxml