From dc2140a88dca092844dd7da12449d242e3b5ac53 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sat, 30 Sep 2017 02:15:40 -0500
Subject: [PATCH] Update paper.dm

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

diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 47c7b81e26..7f301cc1e8 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -403,8 +403,5 @@
 	return
 
 /obj/item/paper/crumpled/bloody
-<<<<<<< HEAD
 	icon_state = "scrap_bloodied"
-=======
-	icon_state = "scrap_bloodied"
->>>>>>> 086d636... Alt-clicking descriptions when examining (#30988)
+