django/tests/migrations/test_migrations_conflict
django-bot 9c19aff7c7 Refs #33476 -- Reformatted code with Black. 2022-02-07 20:37:05 +01:00
..
0001_initial.py Refs #33476 -- Reformatted code with Black. 2022-02-07 20:37:05 +01:00
0002_conflicting_second.py Refs #33476 -- Reformatted code with Black. 2022-02-07 20:37:05 +01:00
0002_second.py Refs #33476 -- Reformatted code with Black. 2022-02-07 20:37:05 +01:00
__init__.py Migration VCS conflict detection and --merge for makemigrations 2013-12-04 16:01:49 +00:00