Skip to content

Commit

Permalink
Merge pull request #373 from ror-community/api-v2-create
Browse files Browse the repository at this point in the history
resolve merge conflicts
  • Loading branch information
lizkrznarich committed Mar 11, 2024
2 parents 2e68393 + 881e193 commit d24575a
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions rorapi/common/urls.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
from django.conf.urls import url, include
from django.urls import path, re_path
from rest_framework.documentation import include_docs_urls

from . import viewss
from rorapi.common.views import HeartbeatView,GenerateAddress,GenerateId,IndexData,IndexDataDump,BulkUpdate

urlpatterns = [
Expand Down

0 comments on commit d24575a

Please sign in to comment.