Delete action.dm.rej

2017-08-03 06:11:26 -07:00
parent 489840752f
commit 0ec200f540
1 changed files with 0 additions and 9 deletions
@@ -1,9 +0,0 @@
-diff a/code/datums/action.dm b/code/datums/action.dm	(rejected hunks)
-@@ -491,7 +491,6 @@
- 	S.action = src
- 	name = S.name
- 	desc = S.desc
-	button_icon = S.action_icon
- 	icon_icon = S.action_icon
- 	button_icon_state = S.action_icon_state
- 	background_icon_state = S.action_background_icon_state