Skip to content

Commit

Permalink
fix(0078_auto_20200803_2109.py): handle conflict because of mergeing
Browse files Browse the repository at this point in the history
  • Loading branch information
Oo-RR-oO committed Aug 26, 2020
1 parent 5e9e1e0 commit 986257f
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class Migration(migrations.Migration):

dependencies = [
('sites', '0002_alter_domain_unique'),
('oneid_meta', '0077_i18nmobileconfig'),
('oneid_meta', '0078_i18nmobileconfig'),
]

operations = [
Expand Down

0 comments on commit 986257f

Please sign in to comment.