Merge pull request #77 from Cryptophobia/master

Cryptophobia · web-flow · commit 3f6ec6baea24 · 2018-10-15T13:16:08.000-04:00
fix(api/migrations): fix migrations conflict without merge
diff --git a/rootfs/api/migrations/0028_config_termination_grace_period.py b/rootfs/api/migrations/0028_config_termination_grace_period.py
@@ -9,7 +9,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('api', '0026_release_exception'),
+        ('api', '0027_auto_20180424_1742'),
     ]
 
     operations = [

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`class Migration(migrations.Migration):`
`10`	`10`
`11`	`11`	`dependencies = [`
`12`		`- ('api', '0026_release_exception'),`
	`12`	`+ ('api', '0027_auto_20180424_1742'),`
`13`	`13`	`]`
`14`	`14`
`15`	`15`	`operations = [`