Fix Merge Conflicts

xsn34kzx · Aug 24, 2024 · 9e1e403 · 9e1e403
2 parents 82cabfe + e5e71c1
commit 9e1e403
Show file tree

Hide file tree

Showing 994 changed files with 98,374 additions and 113,112 deletions.
diff --git a/public/images/ui/hall_of_fame_blue.png b/public/images/ui/hall_of_fame_blue.png
diff --git a/public/images/ui/hall_of_fame_red.png b/public/images/ui/hall_of_fame_red.png
diff --git a/public/images/ui/legacy/hall_of_fame_blue.png b/public/images/ui/legacy/hall_of_fame_blue.png
diff --git a/public/images/ui/legacy/hall_of_fame_red.png b/public/images/ui/legacy/hall_of_fame_red.png
diff --git a/src/enums/game-data-type.ts b/src/enums/game-data-type.ts
@@ -6,5 +6,6 @@ export enum GameDataType {
   SESSION,
   SETTINGS,
   TUTORIALS,
-  SEEN_DIALOGUES
+  SEEN_DIALOGUES,
+  RUN_HISTORY
 }
diff --git a/src/locales/ca_ES/ability-trigger.json b/src/locales/ca_ES/ability-trigger.json
@@ -0,0 +1 @@
+{}
diff --git a/src/locales/ca_ES/ability-trigger.ts b/src/locales/ca_ES/ability-trigger.ts
diff --git a/src/locales/ca_ES/ability.json b/src/locales/ca_ES/ability.json
@@ -0,0 +1 @@
+{}