Update paper.dm

2017-09-30 02:15:40 -05:00
parent b5cdb64a53
commit dc2140a88d
1 changed files with 1 additions and 4 deletions
@@ -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)
+