From e0029b162f6ca9d36b87bb39617f72ab3133aef7 Mon Sep 17 00:00:00 2001
From: Oliver Browne <oliver@posthog.com>
Date: Mon, 22 Jul 2024 11:05:08 +0300
Subject: [PATCH] merge migrations

---
 latest_migrations.manifest                    |  2 +-
 ...tion_alter_plugin_plugin_type_and_more.py} | 21 ++++++++++++--
 .../0448_alter_plugin_plugin_type.py          | 29 -------------------
 3 files changed, 20 insertions(+), 32 deletions(-)
 rename posthog/migrations/{0449_alter_plugin_organization_alter_plugin_url.py => 0448_alter_plugin_organization_alter_plugin_plugin_type_and_more.py} (53%)
 delete mode 100644 posthog/migrations/0448_alter_plugin_plugin_type.py

diff --git a/latest_migrations.manifest b/latest_migrations.manifest
index e9a135426007e7..c561ea08ee0993 100644
--- a/latest_migrations.manifest
+++ b/latest_migrations.manifest
@@ -5,7 +5,7 @@ contenttypes: 0002_remove_content_type_name
 ee: 0016_rolemembership_organization_member
 otp_static: 0002_throttling
 otp_totp: 0002_auto_20190420_0723
-posthog: 0449_alter_plugin_organization_alter_plugin_url
+posthog: 0448_alter_plugin_organization_alter_plugin_plugin_type_and_more
 sessions: 0001_initial
 social_django: 0010_uid_db_index
 two_factor: 0007_auto_20201201_1019
diff --git a/posthog/migrations/0449_alter_plugin_organization_alter_plugin_url.py b/posthog/migrations/0448_alter_plugin_organization_alter_plugin_plugin_type_and_more.py
similarity index 53%
rename from posthog/migrations/0449_alter_plugin_organization_alter_plugin_url.py
rename to posthog/migrations/0448_alter_plugin_organization_alter_plugin_plugin_type_and_more.py
index 0589e7174b6ebb..c36bfc9e1b2833 100644
--- a/posthog/migrations/0449_alter_plugin_organization_alter_plugin_url.py
+++ b/posthog/migrations/0448_alter_plugin_organization_alter_plugin_plugin_type_and_more.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.11 on 2024-07-12 08:26
+# Generated by Django 4.2.14 on 2024-07-22 08:04
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -6,7 +6,7 @@
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("posthog", "0448_alter_plugin_plugin_type"),
+        ("posthog", "0447_alter_integration_kind"),
     ]
 
     operations = [
@@ -21,6 +21,23 @@ class Migration(migrations.Migration):
                 to="posthog.organization",
             ),
         ),
+        migrations.AlterField(
+            model_name="plugin",
+            name="plugin_type",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("local", "local"),
+                    ("custom", "custom"),
+                    ("repository", "repository"),
+                    ("source", "source"),
+                    ("inline", "inline"),
+                ],
+                default=None,
+                max_length=200,
+                null=True,
+            ),
+        ),
         migrations.AlterField(
             model_name="plugin",
             name="url",
diff --git a/posthog/migrations/0448_alter_plugin_plugin_type.py b/posthog/migrations/0448_alter_plugin_plugin_type.py
deleted file mode 100644
index 7204c9b4b1a0b4..00000000000000
--- a/posthog/migrations/0448_alter_plugin_plugin_type.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Generated by Django 4.2.11 on 2024-07-03 13:28
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("posthog", "0447_alter_integration_kind"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="plugin",
-            name="plugin_type",
-            field=models.CharField(
-                blank=True,
-                choices=[
-                    ("local", "local"),
-                    ("custom", "custom"),
-                    ("repository", "repository"),
-                    ("source", "source"),
-                    ("inline", "inline"),
-                ],
-                default=None,
-                max_length=200,
-                null=True,
-            ),
-        ),
-    ]