From 9392b321b876fb51a0b5e2b568563e2e7ac10a98 Mon Sep 17 00:00:00 2001
From: Jari Kolehmainen <jari.kolehmainen@gmail.com>
Date: Thu, 22 Apr 2021 10:45:34 +0300
Subject: [PATCH] Fix HotbarStore merge conflict (#2589)

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
---
 src/common/__tests__/hotbar-store.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/__tests__/hotbar-store.test.ts b/src/common/__tests__/hotbar-store.test.ts
index 615ddc45d7..ceb45e15e0 100644
--- a/src/common/__tests__/hotbar-store.test.ts
+++ b/src/common/__tests__/hotbar-store.test.ts
@@ -24,7 +24,7 @@ describe("HotbarStore", () => {
 
   describe("add", () => {
     it("adds a hotbar", () => {
-      const hotbarStore = HotbarStore.getInstanceOrCreate();
+      const hotbarStore = HotbarStore.createInstance();
 
       hotbarStore.load();
       hotbarStore.add({ name: "hottest" });