Update signals_mob_main.dm

Fluffy-Frontier · Feb 19, 2024 · d989489 · d989489
1 parent cfaa64a
commit d989489
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm
@@ -240,12 +240,9 @@
 	#define COMPONENT_BLOCK_MOB_CHANGE (1<<0)
 /// from /mob/proc/change_mob_type_unchecked() : ()
 #define COMSIG_MOB_CHANGED_TYPE "mob_changed_type"
-<<<<<<< HEAD
-=======
 
 /// from /mob/proc/slip(): (knockdown_amonut, obj/slipped_on, lube_flags [mobs.dm], paralyze, force_drop)
 #define COMSIG_MOB_SLIPPED "mob_slipped"
 
 /// from /mob/proc/key_down(): (key, client/client, full_key)
 #define COMSIG_MOB_KEYDOWN "mob_key_down"
->>>>>>> ebe0a90b5f4 ([MIRROR] bindable action buttons (#1002))