remove conflict

ac73a2e5 · John Red Medrano · fe2e0b3b · ac73a2e5
Commit ac73a2e5 authored Nov 25, 2019 by John Red Medrano
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 7 deletions

app/entities/models.py app/entities/models.py +2 -7

No files found.
--- a/app/entities/models.py
+++ b/app/entities/models.py
@@ -9,14 +9,9 @@ from . import enums
 from django.utils.text import slugify
 from datetime import timedelta
 import os
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-from django.conf import settings
->>>>>>> bd79850f02d697447131ae812adc4b42cf78960a
-=======
+
 from django.conf import settings
->>>>>>> bd79850f02d697447131ae812adc4b42cf78960a
+

 # ********************* AUTH TABLES *********************