Solve conflict migrations (#553)

tzulberti · web-flow · commit 5cc81c3b130c · 2022-10-15T22:06:45.000+08:00
diff --git a/pycompanies/migrations/0005_remove_company_owner.py b/pycompanies/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/pycompanies/migrations/0006_company_owner_to_usercompanyprofile.py b/pycompanies/migrations/0006_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)]

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`class Migration(migrations.Migration):`
`7`	`7`
`8`	`8`	`dependencies = [`
`9`		`- ('pycompanies', '0003_usercompanyprofile'),`
	`9`	`+ ('pycompanies', '0004_alter_usercompanyprofile_user'),`
`10`	`10`	`]`
`11`	`11`
`12`	`12`	`operations = [`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ def backward(apps, schema_editor):`
`23`	`23`	`class Migration(migrations.Migration):`
`24`	`24`
`25`	`25`	`dependencies = [`
`26`		`- ('pycompanies', '0004_alter_usercompanyprofile_user'),`
	`26`	`+ ('pycompanies', '0005_remove_company_owner'),`
`27`	`27`	`]`
`28`	`28`
`29`	`29`	`operations = [migrations.RunPython(forward, backward)]`