Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-05-26 01:17:00 +02:00
Code Issues Projects Releases Wiki Activity

fix: remove conflicts in routes.js

Browse Source
This commit is contained in:
Youssef 2022-01-24 21:28:24 +01:00
parent a414bc2f95
commit 4ca2c00e19
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/component/menu/routes.js
View File

@ -37,7 +37,6 @@ import EditProjectRole from '../admin/project-roles/EditProjectRole/EditProjectR
import CreateUser from '../admin/users/CreateUser/CreateUser'; import CreateUser from '../admin/users/CreateUser/CreateUser';
import EditUser from '../admin/users/EditUser/EditUser'; import EditUser from '../admin/users/EditUser/EditUser';
import CreateApiToken from '../admin/api-token/CreateApiToken/CreateApiToken'; import CreateApiToken from '../admin/api-token/CreateApiToken/CreateApiToken';
<<<<<<< HEAD
import CreateEnvironment from '../environments/CreateEnvironment/CreateEnvironment'; import CreateEnvironment from '../environments/CreateEnvironment/CreateEnvironment';
import EditEnvironment from '../environments/EditEnvironment/EditEnvironment'; import EditEnvironment from '../environments/EditEnvironment/EditEnvironment';
import CreateContext from '../context/CreateContext/CreateContext'; import CreateContext from '../context/CreateContext/CreateContext';
@ -46,10 +45,8 @@ import EditTagType from '../tagTypes/EditTagType/EditTagType';
import CreateTagType from '../tagTypes/CreateTagType/CreateTagType'; import CreateTagType from '../tagTypes/CreateTagType/CreateTagType';
import EditProject from '../project/Project/EditProject/EditProject'; import EditProject from '../project/Project/EditProject/EditProject';
import CreateProject from '../project/Project/CreateProject/CreateProject'; import CreateProject from '../project/Project/CreateProject/CreateProject';
=======
import CreateFeature from '../feature/CreateFeature/CreateFeature/CreateFeature'; import CreateFeature from '../feature/CreateFeature/CreateFeature/CreateFeature';
import EditFeature from '../feature/CreateFeature/EditFeature/EditFeature'; import EditFeature from '../feature/CreateFeature/EditFeature/EditFeature';
>>>>>>> 937e090b (feat: create edit and creat feature screen)
export const routes = [ export const routes = [
// Project // Project