forked from yogstation13/Yogstation
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/bruhlookatthisdood/Yogsta…
- Loading branch information
Showing
5,564 changed files
with
1,072,606 additions
and
1,414,911 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,51 @@ | ||
| *.dmm eol=crlf | ||
| *.dm eol=crlf | ||
| *.dme eol=crlf | ||
| *.md eol=crlf | ||
| *.txt eol=crlf | ||
| *.html eol=crlf | ||
| #this breaks if its in crlf | ||
| code/__DEFINES/rust_g.dm eol=lf | ||
|
|
||
|
|
||
| # merger hooks, run tools/hooks/install.bat or install.sh to set up | ||
| *.dmm merge=dmm | ||
| *.dmi merge=dmi | ||
|
|
||
| # force changelog merging to use union | ||
| html/changelog.html merge=union | ||
|
|
||
| *.dmm eol=crlf | ||
| *.md eol=crlf | ||
| *.txt eol=crlf | ||
| *.html eol=crlf | ||
| #this breaks if its in crlf | ||
| code/__DEFINES/rust_g.dm eol=lf | ||
|
|
||
|
|
||
| ## Enforce text mode and LF line breaks | ||
| *.bat text eol=lf | ||
| *.cjs text eol=lf | ||
| *.css text eol=lf | ||
| *.dm text eol=lf | ||
| *.dme text eol=lf | ||
| *.dmf text eol=lf | ||
| *.htm text eol=lf | ||
| *.html text eol=lf | ||
| *.js text eol=lf | ||
| *.json text eol=lf | ||
| *.jsx text eol=lf | ||
| *.md text eol=lf | ||
| *.ps1 text eol=lf | ||
| *.py text eol=lf | ||
| *.scss text eol=lf | ||
| *.sh text eol=lf | ||
| *.sql text eol=lf | ||
| *.svg text eol=lf | ||
| *.ts text eol=lf | ||
| *.tsx text eol=lf | ||
| *.txt text eol=lf | ||
| *.yaml text eol=lf | ||
| *.yml text eol=lf | ||
|
|
||
| ## Enforce binary mode | ||
| *.bmp binary | ||
| *.dll binary | ||
| *.dmb binary | ||
| *.exe binary | ||
| *.gif binary | ||
| *.jpg binary | ||
| *.png binary | ||
| *.so binary | ||
|
|
||
|
|
||
| # merger hooks, run tools/hooks/install.bat or install.sh to set up | ||
| *.dmm merge=dmm | ||
| *.dmi merge=dmi | ||
|
|
||
| # force changelog merging to use union | ||
| html/changelog.html merge=union |
Validating CODEOWNERS rules …
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.