Resolved additional conflicts
This commit is contained in:
1
CookieMonster.js
Normal file
1
CookieMonster.js
Normal file
File diff suppressed because one or more lines are too long
@@ -1,10 +1,9 @@
|
|||||||
|
/* eslint-disable no-redeclare */
|
||||||
|
/* eslint-disable no-unused-vars */
|
||||||
/**********
|
/**********
|
||||||
* Header *
|
* Header *
|
||||||
**********/
|
**********/
|
||||||
|
|
||||||
/**
|
|
||||||
* This functions creates the necessary objects and is run when they do not already exist
|
|
||||||
*/
|
|
||||||
const CM = {
|
const CM = {
|
||||||
Backup: {},
|
Backup: {},
|
||||||
Cache: {},
|
Cache: {},
|
||||||
@@ -16,6 +15,4 @@ const CM = {
|
|||||||
Main: {},
|
Main: {},
|
||||||
Options: {},
|
Options: {},
|
||||||
Sim: {},
|
Sim: {},
|
||||||
VersionMajor: '2.031',
|
|
||||||
VersionMinor: '3',
|
|
||||||
};
|
};
|
||||||
Reference in New Issue
Block a user