From 97fc6e8025c9b2d60a543cb79b5e37604d67acdf Mon Sep 17 00:00:00 2001
From: Greg Lind <gwlind@gmail.com>
Date: Fri, 5 Apr 2024 14:13:05 -0700
Subject: [PATCH] fix conflict

---
 requirements/base.txt | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/requirements/base.txt b/requirements/base.txt
index 7ea9dfc2..abc222ff 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -1,12 +1,6 @@
-<<<<<<< HEAD
 Django==3.2.24
 django-filter==2.4.0
 jsonschema==3.2.0
-=======
-jsonschema==3.2.0
-Django==2.2.28
-django-filter==2.4.0
->>>>>>> master
 django-health-check==3.6.1
 git+https://github.com/buildlyio/django-oauth-toolkit-jwt@v0.5.2#egg=django-oauth-toolkit-jwt
 djangorestframework==3.11.2
@@ -17,14 +11,8 @@ futures==3.1.1
 django-cors-headers==2.5.3
 pyswagger==0.8.39
 bravado-core==5.13.1
-<<<<<<< HEAD
 drf-yasg==1.10.2
 requests==2.31.0
 aiohttp==3.8.6
-=======
-drf-yasg==1.17.1
-requests==2.25.0
-aiohttp==3.7.4
->>>>>>> master
 django-auth-ldap==2.1.0
 stripe==2.75.0