From 2287f9bbf0b8836aadc1f32a9a90203f1886d26d Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@peacefrogs.net>
Date: Wed, 6 Feb 2019 16:17:58 +0100
Subject: Merge migrations

---
 .../0084_ishtarsiteprofile_use_town_for_geo.py     | 20 -----------------
 .../migrations/0085_auto_20190204_1149.py          | 26 ----------------------
 .../0085_ishtarsiteprofile_use_town_for_geo.py     | 20 +++++++++++++++++
 .../migrations/0086_auto_20190204_1149.py          | 26 ++++++++++++++++++++++
 4 files changed, 46 insertions(+), 46 deletions(-)
 delete mode 100644 ishtar_common/migrations/0084_ishtarsiteprofile_use_town_for_geo.py
 delete mode 100644 ishtar_common/migrations/0085_auto_20190204_1149.py
 create mode 100644 ishtar_common/migrations/0085_ishtarsiteprofile_use_town_for_geo.py
 create mode 100644 ishtar_common/migrations/0086_auto_20190204_1149.py

(limited to 'ishtar_common/migrations')

diff --git a/ishtar_common/migrations/0084_ishtarsiteprofile_use_town_for_geo.py b/ishtar_common/migrations/0084_ishtarsiteprofile_use_town_for_geo.py
deleted file mode 100644
index 182187e8b..000000000
--- a/ishtar_common/migrations/0084_ishtarsiteprofile_use_town_for_geo.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.10 on 2019-01-22 15:44
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('ishtar_common', '0083_document_index_external_id'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='ishtarsiteprofile',
-            name='use_town_for_geo',
-            field=models.BooleanField(default=True, verbose_name='Use town to locate when coordinates are missing'),
-        ),
-    ]
diff --git a/ishtar_common/migrations/0085_auto_20190204_1149.py b/ishtar_common/migrations/0085_auto_20190204_1149.py
deleted file mode 100644
index d89a8ac94..000000000
--- a/ishtar_common/migrations/0085_auto_20190204_1149.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.10 on 2019-02-04 11:49
-from __future__ import unicode_literals
-
-import django.contrib.gis.db.models.fields
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('ishtar_common', '0084_ishtarsiteprofile_use_town_for_geo'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='ishtarsiteprofile',
-            name='default_center',
-            field=django.contrib.gis.db.models.fields.PointField(default=b'SRID=4326;POINT(2.4397 46.5528)', srid=4326, verbose_name='Maps - default center'),
-        ),
-        migrations.AddField(
-            model_name='ishtarsiteprofile',
-            name='default_zoom',
-            field=models.IntegerField(default=6, verbose_name='Maps - default zoom'),
-        ),
-    ]
diff --git a/ishtar_common/migrations/0085_ishtarsiteprofile_use_town_for_geo.py b/ishtar_common/migrations/0085_ishtarsiteprofile_use_town_for_geo.py
new file mode 100644
index 000000000..8180ffa15
--- /dev/null
+++ b/ishtar_common/migrations/0085_ishtarsiteprofile_use_town_for_geo.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.10 on 2019-01-22 15:44
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ishtar_common', '0084_auto_20190206_1522'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='ishtarsiteprofile',
+            name='use_town_for_geo',
+            field=models.BooleanField(default=True, verbose_name='Use town to locate when coordinates are missing'),
+        ),
+    ]
diff --git a/ishtar_common/migrations/0086_auto_20190204_1149.py b/ishtar_common/migrations/0086_auto_20190204_1149.py
new file mode 100644
index 000000000..0796aa34a
--- /dev/null
+++ b/ishtar_common/migrations/0086_auto_20190204_1149.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.10 on 2019-02-04 11:49
+from __future__ import unicode_literals
+
+import django.contrib.gis.db.models.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ishtar_common', '0085_ishtarsiteprofile_use_town_for_geo'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='ishtarsiteprofile',
+            name='default_center',
+            field=django.contrib.gis.db.models.fields.PointField(default=b'SRID=4326;POINT(2.4397 46.5528)', srid=4326, verbose_name='Maps - default center'),
+        ),
+        migrations.AddField(
+            model_name='ishtarsiteprofile',
+            name='default_zoom',
+            field=models.IntegerField(default=6, verbose_name='Maps - default zoom'),
+        ),
+    ]
-- 
cgit v1.2.3