feat:恢复冲突的代码

main
liu.shiyi 2 years ago
parent d27b0591fe
commit ca6f30e7c3

@ -15,7 +15,7 @@ const customConfig = {
type: 'currentTime',
root: {
version : '0.0.1',
version: '2023071001',
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
customize: {

@ -31,7 +31,7 @@ export const settingConfig = {
const customConfig = {
type: 'digitalFlop',
root: {
version : '0.0.1',
version: '2023071001',
contribution: false
},
customize: {

@ -18,7 +18,7 @@ export const settingConfig = {
const customConfig = {
type: 'iframeChart',
root: {
version : '0.0.1',
version: '2023071001',
url: 'https://www.runoob.com/'
},
customize: {

@ -29,7 +29,7 @@ export const settingConfig = {
const customConfig = {
type: 'linkChart',
root: {
version : '0.0.1',
version: '2023071001',
url: 'https://www.runoob.com/'
},
customize: {

@ -37,7 +37,7 @@ export const settingConfig = {
const customConfig = {
type: 'map',
root: {
version : '0.0.1',
version: '2023071001',
contribution: false
},
customize: {

@ -31,7 +31,7 @@ export const settingConfig = {
const customConfig = {
type: 'screenScrollBoard',
root: {
version : '0.0.1',
version: '2023071001',
contribution: false
},
customize: {

@ -29,7 +29,7 @@ export const settingConfig = {
const customConfig = {
type: 'texts',
root: {
version : '0.0.1',
version: '2023071001',
url: 'https://www.runoob.com/'
},
customize: {

@ -14,7 +14,7 @@ export const settingConfig = {
const customConfig = {
type: 'timeCountDown',
root: {
version : '0.0.1',
version: '2023071001',
endTime: ''
},
customize: {

@ -20,7 +20,7 @@ export const settingConfig = {
const customConfig = {
type: 'border1',
root: {
version : '0.0.1',
version: '2023071001',
contribution: false
},
customize: {

@ -20,7 +20,7 @@ export const settingConfig = {
const customConfig = {
type: 'border10',
root: {
version : '0.0.1',
version: '2023071001',
contribution: false
},
customize: {

@ -20,7 +20,7 @@ export const settingConfig = {
const customConfig = {
type: 'border11',
root: {
version : '0.0.1',
version: '2023071001',
contribution: false
},
customize: {

@ -20,7 +20,7 @@ export const settingConfig = {
const customConfig = {
type: 'border12',
root: {
version : '0.0.1',
version: '2023071001',
contribution: false
},
customize: {

@ -20,7 +20,7 @@ export const settingConfig = {
const customConfig = {
type: 'border13',
root: {
version : '0.0.1',
version: '2023071001',
contribution: false
},
customize: {

@ -20,7 +20,7 @@ export const settingConfig = {
const customConfig = {
type: 'border2',
root: {
version : '0.0.1',
version: '2023071001',
contribution: false
},
customize: {

@ -20,7 +20,7 @@ export const settingConfig = {
const customConfig = {
type: 'border3',
root: {
version : '0.0.1',
version: '2023071001',
contribution: false
},
customize: {

@ -20,7 +20,7 @@ export const settingConfig = {
const customConfig = {
type: 'border4',
root: {
version : '0.0.1',
version: '2023071001',
contribution: false
},
customize: {

@ -20,7 +20,7 @@ export const settingConfig = {
const customConfig = {
type: 'border5',
root: {
version : '0.0.1',
version: '2023071001',
contribution: false
},
customize: {

@ -20,7 +20,7 @@ export const settingConfig = {
const customConfig = {
type: 'border6',
root: {
version : '0.0.1',
version: '2023071001',
contribution: false
},
customize: {

@ -20,7 +20,7 @@ export const settingConfig = {
const customConfig = {
type: 'border7',
root: {
version : '0.0.1',
version: '2023071001',
contribution: false
},
customize: {

@ -20,7 +20,7 @@ export const settingConfig = {
const customConfig = {
type: 'border8',
root: {
version : '0.0.1',
version: '2023071001',
contribution: false
},
customize: {

@ -20,7 +20,7 @@ export const settingConfig = {
const customConfig = {
type: 'border9',
root: {
version : '0.0.1',
version: '2023071001',
contribution: false
},
customize: {

@ -16,7 +16,7 @@ export const settingConfig = {
const customConfig = {
type: 'decoration1',
root: {
version : '0.0.1',
version: '2023071001',
contribution: false
},
customize: {

@ -16,7 +16,7 @@ export const settingConfig = {
const customConfig = {
type: 'decoration10',
root: {
version : '0.0.1',
version: '2023071001',
contribution: false
},
customize: {

@ -16,7 +16,7 @@ export const settingConfig = {
const customConfig = {
type: 'decoration11',
root: {
version : '0.0.1',
version: '2023071001',
contribution: false
},
customize: {

@ -16,7 +16,7 @@ export const settingConfig = {
const customConfig = {
type: 'decoration12',
root: {
version : '0.0.1',
version: '2023071001',
contribution: false
},
customize: {

@ -16,7 +16,7 @@ export const settingConfig = {
const customConfig = {
type: 'decoration2',
root: {
version : '0.0.1',
version: '2023071001',
contribution: false
},
customize: {

@ -16,7 +16,7 @@ export const settingConfig = {
const customConfig = {
type: 'decoration2Reverse',
root: {
version : '0.0.1',
version: '2023071001',
contribution: false
},
customize: {

@ -16,7 +16,7 @@ export const settingConfig = {
const customConfig = {
type: 'decoration3',
root: {
version : '0.0.1',
version: '2023071001',
contribution: false
},
customize: {

@ -16,7 +16,7 @@ export const settingConfig = {
const customConfig = {
type: 'decoration4',
root: {
version : '0.0.1',
version: '2023071001',
contribution: false
},
customize: {

@ -16,7 +16,7 @@ export const settingConfig = {
const customConfig = {
type: 'decoration4Reverse',
root: {
version : '0.0.1',
version: '2023071001',
contribution: false
},
customize: {

@ -16,7 +16,7 @@ export const settingConfig = {
const customConfig = {
type: 'decoration5',
root: {
version : '0.0.1',
version: '2023071001',
contribution: false
},
customize: {

@ -16,7 +16,7 @@ export const settingConfig = {
const customConfig = {
type: 'decoration6',
root: {
version : '0.0.1',
version: '2023071001',
contribution: false
},
customize: {

@ -16,7 +16,7 @@ export const settingConfig = {
const customConfig = {
type: 'decoration8',
root: {
version : '0.0.1',
version: '2023071001',
contribution: false
},
customize: {

@ -16,7 +16,7 @@ export const settingConfig = {
const customConfig = {
type: 'decoration8Reverse',
root: {
version : '0.0.1',
version: '2023071001',
contribution: false
},
customize: {

@ -16,7 +16,7 @@ export const settingConfig = {
const customConfig = {
type: 'decoration9',
root: {
version : '0.0.1',
version: '2023071001',
contribution: false
},
customize: {

@ -4,7 +4,7 @@ export const settingConfig = {
}
const customConfig = {
root: {
version : '0.0.1',
version: '2023071001',
contribution: false
},
customize: {

Loading…
Cancel
Save