From 22408b818e67a1993969501b368cc7685e432828 Mon Sep 17 00:00:00 2001
From: sandeepsajan0 <sandeepsajan0@gmail.com>
Date: Tue, 1 Feb 2022 17:03:31 +0530
Subject: [PATCH] Resolve conflicts and update requirements

---
 hypha/settings/base.py | 1 -
 requirements.txt       | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/hypha/settings/base.py b/hypha/settings/base.py
index 1bc784585..dc41d420a 100644
--- a/hypha/settings/base.py
+++ b/hypha/settings/base.py
@@ -6,7 +6,6 @@ Django settings for hypha project.
 import os
 
 import dj_database_url
-
 from environs import Env
 
 env = Env()
diff --git a/requirements.txt b/requirements.txt
index c3e42acd4..56d0b31d3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -33,6 +33,7 @@ djangorestframework-api-key==2.1.0
 djangorestframework==3.12.4
 drf-nested-routers==0.93.4
 drf-yasg==1.20.0
+environs==9.5.0
 gunicorn==20.1.0
 mailchimp3==3.0.16
 mistune==0.8.4
-- 
GitLab