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

Renamed conflicting migration file

Merge pull request #7231 from edx/mattdrayer/rename-migration-file
Renamed conflicting migration file
f85d2451 · Matt Drayer · be77f8bf · df937f1f · f85d2451
Commit f85d2451 authored Mar 05, 2015 by Matt Drayer
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 0 deletions

common/djangoapps/student/migrations/0046_auto__add_entranceexamconfiguration__add_unique_entranceexamconfigurat.py
+0 -0

No files found.
--- a/common/djangoapps/student/migrations/0044_auto__add_entranceexamconfiguration__add_unique_entranceexamconfigurat.py
+++ b/common/djangoapps/student/migrations/0044_auto__add_entranceexamconfiguration__add_unique_entranceexamconfigurat.py