저장(?)

Assets/My project/Inventory/Scripts/InventoryItemType.cs

@@ -1,15 +0,0 @@
-using UnityEngine;
-
-/// <summary>
-/// 인벤토리에서 관리할 아이템 종류입니다.
-/// 문자열 대신 enum을 사용하면 오타로 인한 버그를 줄일 수 있습니다.
-/// </summary>
-public enum InventoryItemType
-{
-    Fish,
-    OldCompass,
-    Trash,
-    Bottle,
-    MemoryPiece,
-    Coin
-}

Assets/My project/Inventory/Scripts/InventoryItemType.cs.meta

@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: a363e83699ebc374c8aab5d2859976cd

Assets/My project/Inventory/Scripts/InventoryManager.cs

@@ -794,7 +794,6 @@ private void NotifyAllItemsChanged()
         onInventoryChanged?.Invoke();
     }
 
-<<<<<<< HEAD
     private void NotifyMemoryPieceProgress()
     {
         int current = GetItemCount(memoryPieceItemType);
@@ -826,13 +825,11 @@ private void NotifyMemoryPieceProgress()
     public void DebugClearInventory() => ClearInventory();
     public void DebugDeleteSave() => DeleteSavedInventory();
 
-=======
     public void InventoryUIToggle()
     {
         _inventoryUI.gameObject.SetActive(!_inventoryUI.gameObject.activeSelf);
     }
 
->>>>>>> 695f9b7a14841768ae101b4395af63c4ab86d096
 #if UNITY_EDITOR
     private void OnValidate()
     {