yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 08:19:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Remove merge conflict file

Browse Source
This commit is contained in:
Gustav Hansen 2023-01-31 14:59:41 +01:00
parent 829535d33b
commit 6779e145a5
1 changed files with 0 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
packages/core/admin/ee/admin/pages/SettingsPage/utils/customRoutes.js.orig
View File

@ -1,41 +0,0 @@
const routes = [];
<<<<<<< HEAD
if (strapi.features.isEnabled(strapi.features.SSO)) {
routes.push({
async Component() {
const component = await import(
/* webpackChunkName: "sso-settings-page" */ '../pages/SingleSignOn'
);
=======
if (window.strapi.features.isEnabled(strapi.features.SSO)) {
routes.push({
async Component() {
const component = await import(/* webpackChunkName: "sso-settings-page" */ '../SingleSignOn');
>>>>>>> feature/review-workflows-settings-setup
return component;
},
to: '/settings/single-sign-on',
exact: true,
});
}
<<<<<<< HEAD
=======
if (window.strapi.isEE) {
routes.push({
async Component() {
const component = await import(
/* webpackChunkName: "review-workflows-settings" */ '../pages/ReviewWorkflows'
);
return component;
},
to: '/settings/review-workflows',
exact: true,
});
}
>>>>>>> feature/review-workflows-settings-setup
export default routes;