VS Code prank fix

space-wizards · Sep 27, 2024 · 3f2cefb · 3f2cefb
1 parent 38ce9aa
commit 3f2cefb
Showing 1 changed file with 0 additions and 11 deletions.
diff --git a/Resources/Prototypes/Recipes/Crafting/tallbox.yml b/Resources/Prototypes/Recipes/Crafting/tallbox.yml
@@ -15,17 +15,6 @@
   objectType: Structure
 
 - type: construction
-<<<<<<< HEAD
-  id: ClosetFreezer
-  graph: ClosetFreezer
-  startNode: start
-  targetNode: done
-  category: construction-category-storage
-  objectType: Structure
-
-- type: construction
-=======
->>>>>>> parent of 756904abba (upstream)
   id: ClosetWall
   graph: ClosetWall
   startNode: start