merge

apps/collection/models.py

@@ -1,19 +1,19 @@
 import re
-from mptt.models import MPTTModel, TreeForeignKey
+
 from django.contrib.contenttypes.fields import ContentType
 from django.contrib.postgres.fields import JSONField
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
 from django.utils.translation import gettext_lazy as _
+from mptt.models import MPTTModel, TreeForeignKey
+from slugify import slugify
 
+from utils.models import IntermediateGalleryModelMixin
 from utils.models import (
     ProjectBaseMixin, TJSONField, TranslatedFieldsMixin,
     URLImageMixin,
 )
 from utils.querysets import RelatedObjectsCountMixin
-from utils.models import IntermediateGalleryModelMixin, GalleryMixin
-
-from slugify import slugify
 
 
 # Mixins

apps/location/migrations/0033_merge_20191224_0920.py

@@ -0,0 +1,14 @@
+# Generated by Django 2.2.7 on 2019-12-24 09:20
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('location', '0032_merge_20191209_0832'),
+        ('location', '0032_auto_20191220_1019'),
+    ]
+
+    operations = [
+    ]