Claude Paroz e8a7436941 [1.7.x] Harmonized some PEP 0263 coding preambles ...

Backport of e520a73ee from master.

2014-05-15 20:01:31 +02:00

..

__init__.py

Migration VCS conflict detection and --merge for makemigrations

2013-12-04 16:01:49 +00:00

0001_initial.py

[1.7.x] Harmonized some PEP 0263 coding preambles

2014-05-15 20:01:31 +02:00

0002_conflicting_second.py

[1.7.x] Harmonized some PEP 0263 coding preambles

2014-05-15 20:01:31 +02:00

0002_second.py

[1.7.x] Harmonized some PEP 0263 coding preambles

2014-05-15 20:01:31 +02:00