david/CookieMonster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve conflicts

Browse Source
This commit is contained in:
Daniël van Noord
2021-02-10 20:30:50 +01:00
parent fec72bbf91
commit 39b1ec6db4
2 changed files with 10 additions and 5654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5644
CookieMonster.js
View File

File diff suppressed because it is too large Load Diff

20
src/Header.js
View File

@@ -6,16 +6,16 @@
* This functions creates the necessary objects and is run when they do not already exist * This functions creates the necessary objects and is run when they do not already exist
*/ */
const CM = { const CM = {
Backup: {}, Backup: {},
Cache: {}, Cache: {},
Config: {}, Config: {},
ConfigData: {}, ConfigData: {},
Data: {}, Data: {},
Disp: {}, Disp: {},
Footer: {}, Footer: {},
Main: {}, Main: {},
Options: {}, Options: {},
Sim: {}, Sim: {},
VersionMajor: '2.031', VersionMajor: '2.031',
VersionMinor: '3', VersionMinor: '3',
}; };