department info api (#1)

Co-authored-by: aarav0012 <[email protected]>
FusionIIIT · Jan 19, 2025 · 0c7726f · 0c7726f
1 parent 9cef7e9
commit 0c7726f
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/FusionIIIT/Fusion/settings/common.py b/FusionIIIT/Fusion/settings/common.py
@@ -50,12 +50,7 @@
 
 # email of sender
 
-<<<<<<< HEAD
-EMAIL_HOST_USER = '[email protected]'
-# EMAIL_HOST_PASSWORD  = 'password'
-=======
 EMAIL_HOST_USER = '[email protected]'
->>>>>>> dashboard_client
 
 EMAIL_PORT = 587
 ACCOUNT_EMAIL_REQUIRED = True