resolve migration merge conflict

getsentry · May 2, 2024 · a8593c1 · a8593c1
1 parent ecacf02
commit a8593c1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/migrations_lockfile.txt b/migrations_lockfile.txt
@@ -9,5 +9,5 @@ feedback: 0004_index_together
 hybridcloud: 0016_add_control_cacheversion
 nodestore: 0002_nodestore_no_dictfield
 replays: 0004_index_together
-sentry: 0713_team_remove_actor_state
+sentry: 0714_project_template_models
 social_auth: 0002_default_auto_field
diff --git a/...igrations/0712_project_template_models.py → ...igrations/0714_project_template_models.py b/...igrations/0712_project_template_models.py → ...igrations/0714_project_template_models.py
@@ -1,4 +1,4 @@
-# Generated by Django 5.0.4 on 2024-05-02 18:27
+# Generated by Django 5.0.4 on 2024-05-02 20:14
 
 import django.db.models.deletion
 import django.utils.timezone
@@ -26,7 +26,7 @@ class Migration(CheckedMigration):
     is_post_deployment = False
 
     dependencies = [
-        ("sentry", "0711_backfill_group_attributes_to_self_hosted"),
+        ("sentry", "0713_team_remove_actor_state"),
     ]
 
     operations = [