url master

app/applicationlayer/master/urls.py

@@ -6,19 +6,16 @@ from app.applicationlayer.master.company.views import AdminCompanyViewSet
 from app.applicationlayer.master.department.views import AdminDepartmentViewSet
 from app.applicationlayer.master.user_type.views import UserTypeViewSet
 from app.applicationlayer.master.attachment.views import MasterAttachmentViewSet
+from app.applicationlayer.master.branch.views import BranchViewSet
 
 router = routers.DefaultRouter()
 router.register(r'users', AdminAccountViewSet)
 router.register(r'companies', AdminCompanyViewSet)
 router.register(r'departments', AdminDepartmentViewSet)
 router.register(r'attachments', MasterAttachmentViewSet)
+router.register(r'branches', BranchViewSet)
 
 urlpatterns = [
     path('', include(router.urls)),
     url(r'^user-types/$', UserTypeViewSet.as_view(), name="user-types"),
-<<<<<<< HEAD
 ]
-=======
-    url(r'^dashboard/$', RMSDashBoardViewSet.as_view(), name="dashboard"),
-]
->>>>>>> ef388d8... filter files for all dependent of branches endpoint