[djangoproject.com] resolved a silly conflict. This is whay you should avoid editing stuff on the server, kids!
