fix merge

mythmon · Jan 17, 2012 · af5d859 · af5d859
1 parent 286774b
commit af5d859
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/urls.py b/urls.py
@@ -28,10 +28,7 @@
     (r'^postcrash', include('postcrash.urls')),
     (r'^groups', include('groups.urls')),
     (r'^karma', include('karma.urls')),
-<<<<<<< HEAD
-=======
     (r'^kpi/', include('kpi.urls')),
->>>>>>> f7e8292... moved to tastypie
 
     # Kitsune admin (not Django admin).
     (r'^admin/', include(admin.site.urls)),