From 4c7db1fc2d8b4e525d4d4166790a0d00887ede9d Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Sun, 15 Mar 2020 14:45:18 -0400
Subject: [PATCH] Update codex.dm

---
 code/modules/lore_codex/codex.dm | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/code/modules/lore_codex/codex.dm b/code/modules/lore_codex/codex.dm
index 1af8b128ba..8af1bdd924 100644
--- a/code/modules/lore_codex/codex.dm
+++ b/code/modules/lore_codex/codex.dm
@@ -40,12 +40,9 @@
 	w_class = ITEMSIZE_SMALL
 	root_type = /datum/lore/codex/category/main_news
 	libcategory = "Reference"
-<<<<<<< HEAD
+	drop_sound = 'sound/items/drop/device.ogg'
 
 /* //VORESTATION REMOVAL
-=======
-	drop_sound = 'sound/items/drop/device.ogg'
->>>>>>> 22e28f2... Merge pull request #6804 from Cerebulon/bigsounds
 // Combines SOP/Regs/Law
 /obj/item/weapon/book/codex/corp_regs
 	name = "NanoTrasen Regulatory Compendium"