Fix merge

unstructuredstudio · Feb 5, 2023 · c669a07 · c669a07
1 parent 72e1fae
commit c669a07
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/zubhub_backend/zubhub/zubhub/urls.py b/zubhub_backend/zubhub/zubhub/urls.py
@@ -56,10 +56,7 @@
             path('api/rest-auth/password/reset/confirm/', PasswordResetConfirmView.as_view()),
             path('api/creators/', include('creators.urls')),
             path('api/projects/', include('projects.urls')),
-<<<<<<< HEAD
             path('api/activities/', include('activities.urls')),
-=======
->>>>>>> master
             path('api/activitylog/', include('activitylog.urls')),
             path('api/upload-file/', UploadFileAPIView),
             path('api/delete-file/', DeleteFileAPIView),