django/tests/migrations/test_migrations_conflict
Flavio Curella c2e70f0265 Fixed #21127 -- Started deprecation toward requiring on_delete for ForeignKey/OneToOneField 2015-07-27 18:28:13 -04:00
..
0001_initial.py Harmonized some PEP 0263 coding preambles 2014-05-15 19:58:41 +02:00
0002_conflicting_second.py Harmonized some PEP 0263 coding preambles 2014-05-15 19:58:41 +02:00
0002_second.py Fixed #21127 -- Started deprecation toward requiring on_delete for ForeignKey/OneToOneField 2015-07-27 18:28:13 -04:00
__init__.py Migration VCS conflict detection and --merge for makemigrations 2013-12-04 16:01:49 +00:00