From eb50823355fecbe131c2686da5ffcb4aca7f0d4b Mon Sep 17 00:00:00 2001
From: SpaceLoveSs13 <68121607+SpaceLoveSs13@users.noreply.github.com>
Date: Wed, 29 May 2024 09:51:14 +0530
Subject: [PATCH] Update mining.dm

---
 code/modules/cargo/bounties/mining.dm | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/code/modules/cargo/bounties/mining.dm b/code/modules/cargo/bounties/mining.dm
index cdf9aaabb72..772538f3ca2 100644
--- a/code/modules/cargo/bounties/mining.dm
+++ b/code/modules/cargo/bounties/mining.dm
@@ -60,15 +60,10 @@
 	description = "We're getting some....weird messages from Station 14's Research Director. And most of what they said was incoherent. But they apparently want an icewing wreath. Could you send them one?"
 	reward = CARGO_CRATE_VALUE * 30
 	required_count = 1
-<<<<<<< HEAD
-	wanted_types = list(/obj/item/clothing/neck/wreath/icewing = FALSE)
+	wanted_types = list(/obj/item/clothing/neck/wreath/icewing = TRUE)
 	
 //SKYRAT EDIT REMOVAL
 /*
-=======
-	wanted_types = list(/obj/item/clothing/neck/wreath/icewing = TRUE)
-
->>>>>>> 1507792ec18 (Make Watcher Wreath Bounties Completable (#83523))
 /datum/bounty/item/mining/bone_dagger
 	name = "Bone Daggers"
 	description = "Central Command's canteen is undergoing budget cuts. Ship over some bone daggers so our chef can keep working."