resolve migration conflict

Author: chibie

app/dashboard/migrations/0190_merge_20211004_1733.py

@@ -0,0 +1,14 @@
+# Generated by Django 2.2.24 on 2021-10-04 17:33
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dashboard', '0189_auto_20211001_1905'),
+        ('dashboard', '0188_auto_20211002_0156'),
+    ]
+
+    operations = [
+    ]

app/dashboard/views.py

@@ -41,8 +41,8 @@
 from django.contrib.staticfiles.storage import staticfiles_storage
 from django.core.exceptions import ObjectDoesNotExist, PermissionDenied, ValidationError
 from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
-from django.db.utils import IntegrityError
 from django.db.models import Count, Q, Sum
+from django.db.utils import IntegrityError
 from django.forms import URLField
 from django.http import Http404, HttpResponse, JsonResponse
 from django.shortcuts import get_object_or_404, redirect

app/grants/tests/models/test_grant_clr.py

@@ -249,4 +249,4 @@ def test_grant_clr_has_claim_end_date_attribute(self):
 
         grant_clr = GrantCLRFactory()
 
-        assert hasattr(grant_clr, 'claim_end_date')
+        assert hasattr(grant_clr, 'claim_end_date')