From 4ca2c00e19a66adeebbbe7c12c4a9bb22feb63d4 Mon Sep 17 00:00:00 2001 From: Youssef Date: Mon, 24 Jan 2022 21:28:24 +0100 Subject: [PATCH] fix: remove conflicts in routes.js --- frontend/src/component/menu/routes.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/frontend/src/component/menu/routes.js b/frontend/src/component/menu/routes.js index 9b00679068..fae9398d48 100644 --- a/frontend/src/component/menu/routes.js +++ b/frontend/src/component/menu/routes.js @@ -37,7 +37,6 @@ import EditProjectRole from '../admin/project-roles/EditProjectRole/EditProjectR import CreateUser from '../admin/users/CreateUser/CreateUser'; import EditUser from '../admin/users/EditUser/EditUser'; import CreateApiToken from '../admin/api-token/CreateApiToken/CreateApiToken'; -<<<<<<< HEAD import CreateEnvironment from '../environments/CreateEnvironment/CreateEnvironment'; import EditEnvironment from '../environments/EditEnvironment/EditEnvironment'; import CreateContext from '../context/CreateContext/CreateContext'; @@ -46,10 +45,8 @@ import EditTagType from '../tagTypes/EditTagType/EditTagType'; import CreateTagType from '../tagTypes/CreateTagType/CreateTagType'; import EditProject from '../project/Project/EditProject/EditProject'; import CreateProject from '../project/Project/CreateProject/CreateProject'; -======= import CreateFeature from '../feature/CreateFeature/CreateFeature/CreateFeature'; import EditFeature from '../feature/CreateFeature/EditFeature/EditFeature'; ->>>>>>> 937e090b (feat: create edit and creat feature screen) export const routes = [ // Project