Skip to content

Commit

Permalink
Update code/modules/mapping/merge_conflicts.dm
Browse files Browse the repository at this point in the history
Co-authored-by: Drathek <[email protected]>
  • Loading branch information
harryob and Drulikar authored Nov 6, 2023
1 parent ccc780e commit cb2e9d0
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion code/modules/mapping/merge_conflicts.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
. = ..()
var/msg = "HEY, LISTEN!!! Merge Conflict Marker detected at [AREACOORD(src)]! Please manually address all potential merge conflicts!!!"
to_chat(world, SPAN_BOLDANNOUNCE("[msg]"))
warning(msg)
CRASH(msg)

0 comments on commit cb2e9d0

Please sign in to comment.