Revert "Update advanced_microwave.yml"

This reverts commit 47ba535.
DeltaV-Station · Jan 13, 2025 · 952a9c7 · 952a9c7
1 parent 47ba535
commit 952a9c7
Showing 1 changed file with 0 additions and 11 deletions.
diff --git a/Resources/Prototypes/_DV/Entities/Structures/Machines/advanced_microwave.yml b/Resources/Prototypes/_DV/Entities/Structures/Machines/advanced_microwave.yml
@@ -19,14 +19,3 @@
     intensitySlope: 10
     canCreateVacuum: false
     deleteAfterExplosion: false
-<<<<<<< HEAD
-=======
-  - type: FoodRecipeProvider
-    providedRecipes: # if any new unique foods get added this will need updating
-    - RecipeBaguetteSword
-    - RecipeThrowingCroissant
-  - type: RadiationSource
-    intensity: 0.25
-    slope: 0.1
-    enabled: false
->>>>>>> parent of 73b3d2809b (Merge branch 'microwave-ops' of https://github.com/Stop-Signs/Delta-v into microwave-ops)