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

Add required configuration for automated map merge script. (#19484)

Browse Source 
* Update merge_driver script.

* Actually tick and compile new files.

* Improve marker description.
This commit is contained in:
warriorstar-orion
2022-11-05 15:58:35 +00:00
committed by GitHub
parent 4ace2d6c2b
commit 274ef027dc
6 changed files with 38 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitattributes
+2
View File
@@ -0,0 +1,2 @@
## Merger hooks, run tools/hooks/install.bat or install.sh to set up
*.dmm text eol=lf merge=dmm