Skip to content

E
ems3.3
Commit 802a5405 authored by TZW's avatar TZW
Browse files
Options

111

parent f95d8d19
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
config/defaultSettings.js
View file @ 802a5405
...@@ -8,12 +8,8 @@ const Settings = { ...@@ -8,12 +8,8 @@ const Settings = {
fixedHeader: false, fixedHeader: false,
fixSiderbar: false, fixSiderbar: false,
pwa: false, pwa: false,
<<<<<<< HEAD
// "logo": "/staticfile/group1/M00/00/00/oYYBAGNuFCqARiJKAAGIO2gWB34399.png", // "logo": "/staticfile/group1/M00/00/00/oYYBAGNuFCqARiJKAAGIO2gWB34399.png",
logo: './LOGO.png', logo: './LOGO.png',
=======
logo: '/staticfile/group1/M00/00/00/oYYBAGNuFCqARiJKAAGIO2gWB34399.png',
>>>>>>> 0d54e48b3af05a0942c22149d3af3ae95be97691
colorPrimary: '#1890ff', colorPrimary: '#1890ff',
siderMenuType: 'sub', siderMenuType: 'sub',
proxypath: '/emspro', proxypath: '/emspro',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment