Merge pull request #7231 from edx/mattdrayer/rename-migration-file

Browse Source

Renamed conflicting migration file

...

This commit is contained in:

Matt Drayer

2015-03-05 12:09:25 -05:00

parent be77f8bf8c df937f1feb

commit f85d2451ef

1 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

common/djangoapps/student/migrations/0044_auto__add_entranceexamconfiguration__add_unique_entranceexamconfigurat.py → common/djangoapps/student/migrations/0046_auto__add_entranceexamconfiguration__add_unique_entranceexamconfigurat.py