Skip to content
Commit 8df3d2b4 authored by Gary Wilson Jr's avatar Gary Wilson Jr
Browse files

In `MergeDict` class, changed variable names to not clash with `dict` builtin. 


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6711 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent dab85031
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