Resolved additional conflicts

2021-02-10 20:32:54 +01:00
parent 39b1ec6db4
commit a24c666993
2 changed files with 4 additions and 6 deletions
--- a/CookieMonster.js
+++ b/CookieMonster.js
--- a/src/Header.js
+++ b/src/Header.js
@@ -1,10 +1,9 @@
+/* eslint-disable no-redeclare */
+/* eslint-disable no-unused-vars */
 /**********
 * Header *
 **********/

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