Squash down migration files

3 files changed, 3 insertions, 36 deletions

diff --git a/pydis_site/apps/api/migrations/0047_merge_20191025_1920.py b/pydis_site/apps/api/migrations/0047_merge_20191025_1920.py
deleted file mode 100644
index f70fe24f..00000000
--- a/pydis_site/apps/api/migrations/0047_merge_20191025_1920.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# Generated by Django 2.2.6 on 2019-10-25 17:20
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('api', '0046_reminder_jump_url'),
-        ('api', '0046_offensivemessage'),
-    ]
-
-    operations = [
-    ]
diff --git a/pydis_site/apps/api/migrations/0046_offensivemessage.py b/pydis_site/apps/api/migrations/0047_offensivemessage.py
index 0ce65946..f2068c1b 100644
--- a/pydis_site/apps/api/migrations/0046_offensivemessage.py
+++ b/pydis_site/apps/api/migrations/0047_offensivemessage.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.2.6 on 2019-10-24 17:57
+# Generated by Django 2.2.6 on 2019-11-07 17:55
 
 import django.core.validators
 from django.db import migrations, models
@@ -9,7 +9,7 @@ import pydis_site.apps.api.models.utils
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('api', '0045_add_plural_name_for_log_entry'),
+        ('api', '0046_reminder_jump_url'),
     ]
 
     operations = [
@@ -18,7 +18,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.BigIntegerField(help_text='The message ID as taken from Discord.', primary_key=True, serialize=False, validators=[django.core.validators.MinValueValidator(limit_value=0, message='Message IDs cannot be negative.')])),
                 ('channel_id', models.BigIntegerField(help_text='The channel ID that the message was sent in, taken from Discord.', validators=[django.core.validators.MinValueValidator(limit_value=0, message='Channel IDs cannot be negative.')])),
-                ('delete_date', models.DateField(help_text='The date on which the message will be auto-deleted.', validators=[pydis_site.apps.api.models.bot.offensive_message.future_date_validator])),
+                ('delete_date', models.DateTimeField(help_text='The date on which the message will be auto-deleted.', validators=[pydis_site.apps.api.models.bot.offensive_message.future_date_validator])),
             ],
             bases=(pydis_site.apps.api.models.utils.ModelReprMixin, models.Model),
         ),
diff --git a/pydis_site/apps/api/migrations/0048_auto_20191025_1921.py b/pydis_site/apps/api/migrations/0048_auto_20191025_1921.py
deleted file mode 100644
index 2e5e670a..00000000
--- a/pydis_site/apps/api/migrations/0048_auto_20191025_1921.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by Django 2.2.6 on 2019-10-25 17:21
-
-from django.db import migrations, models
-import pydis_site.apps.api.models.bot.offensive_message
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('api', '0047_merge_20191025_1920'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='offensivemessage',
-            name='delete_date',
-            field=models.DateTimeField(help_text='The date on which the message will be auto-deleted.', validators=[pydis_site.apps.api.models.bot.offensive_message.future_date_validator]),
-        ),
-    ]