Andrew Godwin 3b8e46cbc7 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	…
__init__.py	…