mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-29 16:18:01 +01:00
Aleksej KomarovandRob Bailey
133076afb0
* Validate committed build in Travis * Something different * Document installation of git hooks * Grammar perhaps * Call tgui hook installer from tools/hooks/install.sh
11 lines
229 B
Plaintext
11 lines
229 B
Plaintext
* text=auto
|
|
|
|
## Enforce text mode and LF line breaks
|
|
*.js text eol=lf
|
|
*.css text eol=lf
|
|
*.html text eol=lf
|
|
*.json text eol=lf
|
|
|
|
## Treat bundles as binary and ignore them during conflicts
|
|
*.bundle.* binary merge=tgui-merge-bundle
|