mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-01-05 16:06:07 +00:00
Code Issues 30 Releases Wiki Activity
8d9901c961
django/tests/migrations/test_migrations_conflict
History
…
..
__init__.py Migration VCS conflict detection and --merge for makemigrations 2013-12-04 16:01:49 +00:00
0001_initial.py
0002_conflicting_second.py
0002_second.py