Arthur de Jong

Open Source / Free Software developer

summaryrefslogtreecommitdiffstats
path: root/tests/migrations/test_migrations_conflict/0002_conflicting_second.py
Commit message (Expand)AuthorAgeFilesLines
* Harmonized some PEP 0263 coding preamblesClaude Paroz2014-05-151-1/+1
* Fixed #22350 -- Consistently serialize bytes and text in ...Simon Charette2014-04-141-0/+3
* Migration VCS conflict detection and --merge for makemigr...Andrew Godwin2013-12-041-0/+17