merge conflict migration

app/accesslayer/views.py

@@ -118,8 +118,6 @@ class ForgotPassword(APIView):
 
         existingUser = User.objects.filter(email=email).first()
 
-        print(existingUser)
-
         if existingUser:
             # Check if there's existing request
             exToken = AuthToken\

app/entities/migrations/0011_merge_20190913_1545.py

+# Generated by Django 2.2 on 2019-09-13 15:45
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entities', '0008_passwordreset'),
+        ('entities', '0010_auto_20190913_1143'),
+    ]
+
+    operations = [
+    ]