From 73047d7080f039184176b1472f6795d5e00a4f79 Mon Sep 17 00:00:00 2001
From: Shnok <skyler.maki@gmail.com>
Date: Tue, 16 Jul 2024 20:13:11 +0800
Subject: [PATCH] merge conflicts

---
 l2-unity/Assets/Scripts/Utils/DatUtils.cs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/l2-unity/Assets/Scripts/Utils/DatUtils.cs b/l2-unity/Assets/Scripts/Utils/DatUtils.cs
index 0c16a7ba1..5f324b6a4 100644
--- a/l2-unity/Assets/Scripts/Utils/DatUtils.cs
+++ b/l2-unity/Assets/Scripts/Utils/DatUtils.cs
@@ -25,12 +25,6 @@ public static bool ParseBaseAbstractItemGrpDat(Abstractgrp abstractgrp, string k
         switch (key) {
             case "object_id":
                 abstractgrp.ObjectId = int.Parse(value);
-
-                if (abstractgrp.ObjectId == 5789)
-                {
-                    var id = abstractgrp.ObjectId;
-                    Debug.Log("");
-                }
                 break;
             case "drop_texture": //{{[dropitems.drop_mfighter_m001_t02_u_m00];{[MFighter.MFighter_m001_t02_u]}}}
                 string[] modTex = DatUtils.ParseArray(value);