Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Fix conflicting migrations

Roland Geider28cdb8baa645
diff --git a/wger/core/migrations/0020_add_unit_type_to_repetitionunit.py b/wger/core/migrations/0021_add_unit_type_to_repetitionunit.py
similarity index 96%
rename from wger/core/migrations/0020_add_unit_type_to_repetitionunit.py
rename to wger/core/migrations/0021_add_unit_type_to_repetitionunit.py
index 524611173..eb0de694c 100644
--- a/wger/core/migrations/0020_add_unit_type_to_repetitionunit.py
+++ b/wger/core/migrations/0021_add_unit_type_to_repetitionunit.py
@@ -36,7 +36,7 @@ def reverse_unit_types(apps, schema_editor):
class Migration(migrations.Migration):
dependencies = [
- ('core', '0019_delete_daysofweek'),
+ ('core', '0020_add_trophies_enabled_to_userprofile'),
]
operations = [