p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
django/tests/migrations/test_migrations_conflict
History
Claude Paroz d7b9aaa366 Refs #23919 -- Removed encoding preambles and future imports 2017-01-18 09:55:19 +01:00
..
0001_initial.py Refs #23919 -- Removed encoding preambles and future imports 2017-01-18 09:55:19 +01:00
0002_conflicting_second.py Refs #23919 -- Removed encoding preambles and future imports 2017-01-18 09:55:19 +01:00
0002_second.py Refs #23919 -- Removed encoding preambles and future imports 2017-01-18 09:55:19 +01:00
__init__.py Migration VCS conflict detection and --merge for makemigrations 2013-12-04 16:01:49 +00:00