Code

fixes merge conflict markers#4853

Code

Merged

Drulikar merged 5 commits intocmss13-devs:mastercmss13-devs/cmss13:masterfrom hry-gh:merge-conflictm-arkershry-gh/cmss13:merge-conflictm-arkersCopy head branch name to clipboardNov 7, 2023

+26-3

Commits

Commits on Nov 6, 2023

• fixes merge conflict markers

  hry-gh

  committed
  de6875e

  Copy full SHA for de6875e

• forgot to tick it

  hry-gh

  committed
  bf3eb9c

  Copy full SHA for bf3eb9c

• moves some stuff around

  hry-gh

  committed
  70d95bf

  Copy full SHA for 70d95bf

• my brain

  hry-gh

  committed
  ccc780e

  Copy full SHA for ccc780e

• Update code/modules/mapping/merge_conflicts.dm

  Show description for cb2e9d0
  

  hry-gh

  and

  Drulikar

  authored
  cb2e9d0

  Copy full SHA for cb2e9d0