From c72899c7e64f1e4f2d59c4fa1a5fa37fe33a1f93 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Tue, 21 Jan 2020 01:13:37 -0500
Subject: [PATCH] Update microwave.dm

---
 code/modules/food/kitchen/microwave.dm | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/code/modules/food/kitchen/microwave.dm b/code/modules/food/kitchen/microwave.dm
index 9b1354f2a2e..3863e2c57c1 100644
--- a/code/modules/food/kitchen/microwave.dm
+++ b/code/modules/food/kitchen/microwave.dm
@@ -12,12 +12,8 @@
 	var/operating = 0 // Is it on?
 	var/dirty = 0 // = {0..100} Does it need cleaning?
 	var/broken = 0 // ={0,1,2} How broken is it???
-<<<<<<< HEAD
-	var/global/list/datum/recipe/available_recipes // List of the recipes you can use
-=======
 	var/circuit_item_capacity = 1 //how many items does the circuit add to max number of items
 	var/item_level = 0 // items microwave can handle, 0 foodstuff, 1 materials
->>>>>>> 9027155... Merge pull request #6632 from Mechoid/TheGreatMicrowaveMigration
 	var/global/list/acceptable_items // List of the items you can put in
 	var/global/list/datum/recipe/microwave/available_recipes // List of the recipes you can use
 	var/global/list/acceptable_reagents // List of the reagents you can put in
@@ -401,4 +397,4 @@
 
 		if ("dispose")
 			dispose()
-	return
\ No newline at end of file
+	return