Solve conflict migrations (#553)

PyAr · Oct 15, 2022 · 5cc81c3 · 5cc81c3
1 parent aac4e02
commit 5cc81c3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...s/migrations/0004_remove_company_owner.py → ...s/migrations/0005_remove_company_owner.py b/...s/migrations/0004_remove_company_owner.py → ...s/migrations/0005_remove_company_owner.py
@@ -6,7 +6,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('pycompanies', '0003_usercompanyprofile'),
+        ('pycompanies', '0004_alter_usercompanyprofile_user'),
     ]
 
     operations = [

diff --git a/...05_company_owner_to_usercompanyprofile.py → ...06_company_owner_to_usercompanyprofile.py b/...05_company_owner_to_usercompanyprofile.py → ...06_company_owner_to_usercompanyprofile.py
@@ -23,7 +23,7 @@ def backward(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('pycompanies', '0004_alter_usercompanyprofile_user'),
+        ('pycompanies', '0005_remove_company_owner'),
     ]
 
     operations = [migrations.RunPython(forward, backward)]