Fix broken merge

1 files changed, 1 insertions, 7 deletions

diff --git a/examples/urls.py b/examples/urls.py
index 62001016..ef55e2b5 100644
--- a/examples/urls.py
+++ b/examples/urls.py
@@ -4,15 +4,9 @@ from django.contrib import admin
 admin.autodiscover()
 
 urlpatterns = patterns('',
-<<<<<<< local
-    (r'^blog-post-api/', include('blogpost.urls')),
-    (r'^object-store-api/', include('objectstore.urls')),
-    (r'^pygments-api/', include('pygments_api.urls')),
-=======
-    (r'pygments-example/', include('pygmentsapi.urls')),
+    (r'pygments-example/', include('pygments_api.urls')),
     (r'^blog-post-example/', include('blogpost.urls')),
     (r'^object-store-example/', include('objectstore.urls')),
->>>>>>> other
     (r'^admin/doc/', include('django.contrib.admindocs.urls')),
     (r'^admin/', include(admin.site.urls)),
 )