From 742bda88f2d42a64fe7d15f8c7456726caa2e332 Mon Sep 17 00:00:00 2001
From: HT Cesta <58153179+htc16@users.noreply.github.com>
Date: Thu, 25 Jul 2024 12:51:59 -0300
Subject: [PATCH] Update storages.lua

---
 data-otservbr-global/lib/core/storages.lua | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/data-otservbr-global/lib/core/storages.lua b/data-otservbr-global/lib/core/storages.lua
index 3462da1eac6..56e940c059a 100644
--- a/data-otservbr-global/lib/core/storages.lua
+++ b/data-otservbr-global/lib/core/storages.lua
@@ -1471,11 +1471,8 @@ Storage = {
 			ID3610 = 3610,
 			ID3620 = 3620,
 			ID3666 = 3666,
-<<<<<<< HEAD
-			ID3700 = 3700,
-=======
 			ID3667 = 3667,
->>>>>>> upstream/main
+			ID3700 = 3700,
 			ID3702 = 3702,
 			ID3800 = 3800,
 			ID3801 = 3801,
@@ -1506,7 +1503,6 @@ Storage = {
 					Cookies = 40031,
 				},
 			},
-<<<<<<< HEAD
 			OrcFortress = {
 				Rewards = {
 					KnightAxe = 40033,
@@ -1527,8 +1523,6 @@ Storage = {
 					BagWithAmulets = 40052,
 				},
 			},
-=======
->>>>>>> upstream/main
 		},
 		U6_4 = { -- update 6.4 - Reserved Storages 40071 - 40110
 			BerserkerTreasure = {