From 84b77a94b1d394b926270a9cc025d8b8b0990c26 Mon Sep 17 00:00:00 2001
From: Arthur <worldnomad@gmail.com>
Date: Mon, 11 Mar 2024 08:38:06 -0700
Subject: [PATCH] 9856 fix requirements

---
 requirements.txt | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 70564e18e..96030ebb5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -29,12 +29,8 @@ psycopg[binary,pool]==3.1.18
 PyYAML==6.0.1
 requests==2.31.0
 social-auth-app-django==5.4.0
-<<<<<<< HEAD
-social-auth-core[openidconnect]==4.5.2
-strawberry-graphql-django==0.31.0
-=======
 social-auth-core[openidconnect]==4.5.3
->>>>>>> feature
+strawberry-graphql-django==0.31.0
 svgwrite==1.4.3
 tablib==3.5.0
 tzdata==2024.1