cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 22:17:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Deploy to GitHub pages

Browse Source
This commit is contained in:
github-actions[bot]
2026-08-27 05:10:40 +00:00
committed by GitHub
commit dbb7c68fb2
2864 changed files with 11879 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mapping/merge_conflicts.html
+3
View File
@@ -0,0 +1,3 @@
<!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/776b9861f70566b1e6a0763a465ef22f7920a3d6/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/776b9861f70566b1e6a0763a465ef22f7920a3d6">776b986</a> (master) — <a href="https://github.com/SpaceManiac/SpacemanDMM/blob/master/crates/dmdoc/README.md">dmdoc 1.11.0</a></footer></body></html>