From 3b7096710cd9bd803ddec605ac19b1724b231857 Mon Sep 17 00:00:00 2001
From: Tuan Dang <dangtony98@gmail.com>
Date: Wed, 13 Sep 2023 09:42:36 +0100
Subject: [PATCH] Fix merge conflicts

---
 backend/src/controllers/v1/index.ts | 2 --
 backend/src/routes/v1/index.ts      | 4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/backend/src/controllers/v1/index.ts b/backend/src/controllers/v1/index.ts
index 7fe7b3e99..a9bde9971 100644
--- a/backend/src/controllers/v1/index.ts
+++ b/backend/src/controllers/v1/index.ts
@@ -16,7 +16,6 @@ import * as workspaceController from "./workspaceController";
 import * as secretScanningController from "./secretScanningController";
 import * as webhookController from "./webhookController";
 import * as secretImpsController from "./secretImpsController";
-import * as roleController from "./roleController";
 
 export {
   authController,
@@ -36,6 +35,5 @@ export {
   workspaceController,
   secretScanningController,
   webhookController,
-  roleController,
   secretImpsController
 };
diff --git a/backend/src/routes/v1/index.ts b/backend/src/routes/v1/index.ts
index fc0392f58..46e74d58c 100644
--- a/backend/src/routes/v1/index.ts
+++ b/backend/src/routes/v1/index.ts
@@ -17,7 +17,6 @@ import integrationAuth from "./integrationAuth";
 import secretsFolder from "./secretsFolder";
 import webhooks from "./webhook";
 import secretImps from "./secretImps";
-import role from "./role";
 
 export {
   signup,
@@ -38,6 +37,5 @@ export {
   integrationAuth,
   secretsFolder,
   webhooks,
-  secretImps,
-  role
+  secretImps
 };