diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-12-13 16:15:12 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-12-13 16:15:12 +0100 |
| commit | 3dc5c7a4944dc1d3d4270ed974f1afec68d998b6 (patch) | |
| tree | f05a26c9fee0468f4b8c9c46ccb7aeba11c5d660 | |
| parent | 51f788fd4e81186be2f7b7b4459d3d90a7b47bf2 (diff) | |
| download | Chimère-3dc5c7a4944dc1d3d4270ed974f1afec68d998b6.tar.bz2 Chimère-3dc5c7a4944dc1d3d4270ed974f1afec68d998b6.zip | |
Fix migrations merge
| -rw-r--r-- | chimere/migrations/0050_remove_excluded_status.py (renamed from chimere/migrations/0040_remove_excluded_status.py) | 0 | ||||
| -rw-r--r-- | chimere/migrations/0051_auto__add_field_importer_overwrite.py (renamed from chimere/migrations/0041_auto__add_field_importer_overwrite.py) | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/chimere/migrations/0040_remove_excluded_status.py b/chimere/migrations/0050_remove_excluded_status.py index 3fda56b..3fda56b 100644 --- a/chimere/migrations/0040_remove_excluded_status.py +++ b/chimere/migrations/0050_remove_excluded_status.py diff --git a/chimere/migrations/0041_auto__add_field_importer_overwrite.py b/chimere/migrations/0051_auto__add_field_importer_overwrite.py index 9ae6b84..9ae6b84 100644 --- a/chimere/migrations/0041_auto__add_field_importer_overwrite.py +++ b/chimere/migrations/0051_auto__add_field_importer_overwrite.py |