mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-26 21:48:21 +01:00
3 lines
1.3 KiB
HTML
3 lines
1.3 KiB
HTML
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><base href="../../../"><link rel="stylesheet" href="dmdoc.css"><title>code/modules/mapping/merge_conflicts.dm - Space Station 13</title></head><body><header><a href="index.html">Space Station 13</a> - <a href="index.html#modules">Modules</a> - <a href="index.html#types">Types</a></header><main><h1>code/modules/mapping/merge_conflicts.dm <a href="https://github.com/ParadiseSS13/Paradise/blob/8a8a00a2a9bec485351e5f219982b7315d3504fa/code/modules/mapping/merge_conflicts.dm"><img src="git.png" width="16" height="16" title="code/modules/mapping/merge_conflicts.dm"></a></h1><table class="summary" cellspacing="0"><tr><th>/proc/<a href="global.html#proc/announce_merge_conflict_marker">announce_merge_conflict_marker</a></th><td>We REALLY do not want un-addressed merge conflicts in maps for an
|
|
inexhaustible list of reasons. This should help ensure that this will not be
|
|
missed in case linters fail to catch it for any reason what-so-ever.</td></tr></table></main><footer>paradise.dme <a href="https://github.com/ParadiseSS13/Paradise/tree/8a8a00a2a9bec485351e5f219982b7315d3504fa">8a8a00a</a> (master) — <a href="https://github.com/SpaceManiac/SpacemanDMM/blob/master/crates/dmdoc/README.md">dmdoc 1.11.0</a></footer></body></html> |