PE-419 - Merging migration files conflict.

proversity-org / edx-platform

The Open edX platform, the software that powers edX!

http://open.edx.org/

GNU Affero General Public License v3.0

1 stars 1 forks source link

Closed Squirrel18 closed 5 years ago

Squirrel18 commented 5 years ago

This PR merged a migration files conflict shown when django migrate is running.