fix merge

apps/account/migrations/0012_merge_20191015_0912.py

@@ -0,0 +1,14 @@
+# Generated by Django 2.2.4 on 2019-10-15 09:12
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('account', '0011_merge_20191014_1258'),
+        ('account', '0011_merge_20191011_1336'),
+    ]
+
+    operations = [
+    ]

apps/news/migrations/0022_merge_20191015_0912.py

@@ -0,0 +1,14 @@
+# Generated by Django 2.2.4 on 2019-10-15 09:12
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('news', '0021_auto_20191009_1408'),
+        ('news', '0021_merge_20191002_1300'),
+    ]
+
+    operations = [
+    ]

apps/news/views.py

@@ -1,6 +1,4 @@
 """News app views."""
-from django.shortcuts import get_object_or_404
-from rest_framework import generics, permissions
 from django.conf import settings
 from django.db.transaction import on_commit
 from django.shortcuts import get_object_or_404

project/urls/back.py

@@ -7,7 +7,7 @@ urlpatterns = [
     path('establishments/', include('establishment.urls.back')),
     path('location/', include('location.urls.back')),
     path('news/', include('news.urls.back')),
-    path('tags/', include(('tag.urls', 'tag'), namespace='tag'))
+    path('tags/', include(('tag.urls', 'tag'), namespace='tag')),
     path('account/', include('account.urls.back')),
     path('comment/', include('comment.urls.back')),
 ]