Skip to content
Commit 3b8e46cb authored by Andrew Godwin's avatar Andrew Godwin
Browse files

Migration VCS conflict detection and --merge for makemigrations

parent cd9e85ec
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment