Skip to content
Commit 9c5eafe7 authored by Karen Tracey's avatar Karen Tracey
Browse files

[1.0.X] Block new function (and fixes to same) from snvmerge.py consideration. 


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9988 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent fd5d0cde
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