Resolve conflicts

2021-02-10 20:30:50 +01:00
parent fec72bbf91
commit 39b1ec6db4
2 changed files with 10 additions and 5654 deletions
--- a/CookieMonster.js
+++ b/CookieMonster.js
--- a/src/Header.js
+++ b/src/Header.js
@@ -6,16 +6,16 @@
 * This functions creates the necessary objects and is run when they do not already exist
 */
 const CM = {
-	Backup: {},
-	Cache: {},
-	Config: {},
-	ConfigData: {},
-	Data: {},
-	Disp: {},
-	Footer: {},
-	Main: {},
-	Options: {},
-	Sim: {},
+    Backup: {},
+    Cache: {},
+    Config: {},
+    ConfigData: {},
+    Data: {},
+    Disp: {},
+    Footer: {},
+    Main: {},
+    Options: {},
+    Sim: {},
 	VersionMajor: '2.031',
 	VersionMinor: '3',
 };