From 8271b8f34d55531b9157b661910706c9e879f304 Mon Sep 17 00:00:00 2001
From: Li Yi Yu <li@posthog.com>
Date: Tue, 12 Dec 2023 18:31:30 -0500
Subject: [PATCH] fix migration conflict

---
 latest_migrations.manifest                                    | 2 +-
 .../{0374_alter_survey_type.py => 0375_alter_survey_type.py}  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename posthog/migrations/{0374_alter_survey_type.py => 0375_alter_survey_type.py} (86%)

diff --git a/latest_migrations.manifest b/latest_migrations.manifest
index 26b4b9ff9ae93..0e2a72475b984 100644
--- a/latest_migrations.manifest
+++ b/latest_migrations.manifest
@@ -5,7 +5,7 @@ contenttypes: 0002_remove_content_type_name
 ee: 0015_add_verified_properties
 otp_static: 0002_throttling
 otp_totp: 0002_auto_20190420_0723
-posthog: 0374_scheduled_change
+posthog: 0375_alter_survey_type
 sessions: 0001_initial
 social_django: 0010_uid_db_index
 two_factor: 0007_auto_20201201_1019
diff --git a/posthog/migrations/0374_alter_survey_type.py b/posthog/migrations/0375_alter_survey_type.py
similarity index 86%
rename from posthog/migrations/0374_alter_survey_type.py
rename to posthog/migrations/0375_alter_survey_type.py
index 37f9de1fb6dd0..84d828b643087 100644
--- a/posthog/migrations/0374_alter_survey_type.py
+++ b/posthog/migrations/0375_alter_survey_type.py
@@ -1,11 +1,11 @@
-# Generated by Django 3.2.19 on 2023-12-09 19:28
+# Generated by Django 3.2.19 on 2023-12-12 23:30
 
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("posthog", "0373_externaldataschema"),
+        ("posthog", "0374_scheduled_change"),
     ]
 
     operations = [