mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-01-19 22:13:37 +00:00
274ef027dc
* Update merge_driver script. * Actually tick and compile new files. * Improve marker description.
3 lines
97 B
Plaintext
3 lines
97 B
Plaintext
## Merger hooks, run tools/hooks/install.bat or install.sh to set up
|
|
*.dmm text eol=lf merge=dmm
|