From 2d7a71a4ef5ddd289d6e09d3712a06d26b452fd6 Mon Sep 17 00:00:00 2001
From: Scott Bragg <jsbragg@scriptforge.org>
Date: Sat, 25 Jun 2016 12:49:11 +1000
Subject: [PATCH] Latest migrations so we're all in sync not creating conflicts
 (#18)

---
 .../migrations/0002_auto_20160620_2350.py     | 35 +++++++++++++++++++
 pinaxcon/proposals/migrations/0003_merge.py   | 16 +++++++++
 .../migrations/0004_auto_20160621_0357.py     | 35 +++++++++++++++++++
 3 files changed, 86 insertions(+)
 create mode 100644 pinaxcon/proposals/migrations/0002_auto_20160620_2350.py
 create mode 100644 pinaxcon/proposals/migrations/0003_merge.py
 create mode 100644 pinaxcon/proposals/migrations/0004_auto_20160621_0357.py

diff --git a/pinaxcon/proposals/migrations/0002_auto_20160620_2350.py b/pinaxcon/proposals/migrations/0002_auto_20160620_2350.py
new file mode 100644
index 00000000..30ab1ad6
--- /dev/null
+++ b/pinaxcon/proposals/migrations/0002_auto_20160620_2350.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-06-20 23:50
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('proposals', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='talkproposal',
+            name='audience_level',
+        ),
+        migrations.AddField(
+            model_name='talkproposal',
+            name='materials_release',
+            field=models.BooleanField(default=True, help_text=b"I allow Linux Australia to release any other material (such as slides) from presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"),
+        ),
+        migrations.AddField(
+            model_name='talkproposal',
+            name='target_audience',
+            field=models.IntegerField(choices=[(1, b'User'), (2, b'Business'), (3, b'Community'), (4, b'Developer')], default=0),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='talkproposal',
+            name='recording_release',
+            field=models.BooleanField(default=True, help_text=b"I allow Linux Australia to release any recordings of presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"),
+        ),
+    ]
diff --git a/pinaxcon/proposals/migrations/0003_merge.py b/pinaxcon/proposals/migrations/0003_merge.py
new file mode 100644
index 00000000..a54b64f6
--- /dev/null
+++ b/pinaxcon/proposals/migrations/0003_merge.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-06-21 03:57
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('proposals', '0002_miniconfproposal_tutorialproposal'),
+        ('proposals', '0002_auto_20160620_2350'),
+    ]
+
+    operations = [
+    ]
diff --git a/pinaxcon/proposals/migrations/0004_auto_20160621_0357.py b/pinaxcon/proposals/migrations/0004_auto_20160621_0357.py
new file mode 100644
index 00000000..399725fa
--- /dev/null
+++ b/pinaxcon/proposals/migrations/0004_auto_20160621_0357.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-06-21 03:57
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('proposals', '0003_merge'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='tutorialproposal',
+            name='audience_level',
+        ),
+        migrations.AddField(
+            model_name='tutorialproposal',
+            name='materials_release',
+            field=models.BooleanField(default=True, help_text=b"I allow Linux Australia to release any other material (such as slides) from presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"),
+        ),
+        migrations.AddField(
+            model_name='tutorialproposal',
+            name='target_audience',
+            field=models.IntegerField(choices=[(1, b'User'), (2, b'Business'), (3, b'Community'), (4, b'Developer')], default=0),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='tutorialproposal',
+            name='recording_release',
+            field=models.BooleanField(default=True, help_text=b"I allow Linux Australia to release any recordings of presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"),
+        ),
+    ]