HYP-280 - Finished merge with 'development' branch

hms-dbmi · Sep 13, 2023 · 24a22e1 · 24a22e1
1 parent 8f125a3
commit 24a22e1
Show file tree

Hide file tree

Showing 2 changed files with 270 additions and 175 deletions.
diff --git a/app/hypatio/settings.py b/app/hypatio/settings.py
@@ -57,13 +57,10 @@
     'storages',
     'django_jsonfield_backport',
     'django_q',
-<<<<<<< HEAD
     'rest_framework',
     'drf_spectacular',
     'django_filters',
-=======
     'django_ses',
->>>>>>> development
 ]
 
 MIDDLEWARE = [