admin.py contains bad merge artifacts

koleror / django-admin-views

Easily link custom admin views and direct URLs into the Django admin

BSD 3-Clause "New" or "Revised" License

187 stars 33 forks source link

admin.py contains bad merge artifacts #26

Closed unruthless closed 8 years ago

unruthless commented 8 years ago

The build (0.6.0) is currently broken due to some bad merge artifacts left in https://github.com/frankwiles/django-admin-views/blob/master/admin_views/admin.py#L33:

<<<<<<< HEAD
                    patterns('',
                        url(regex=r'^%s$' % link[1],
=======
                    [
                        url(regex=r'%s' % link[1],
>>>>>>> 122b314ba8e5cb5699bdd55cb27105ecb7fb2226