2019-04-04 21:44:01 +03:00
|
|
|
# Don't allow people to merge changes to these generated files, because the result
|
|
|
|
|
# may be invalid. You need to run "rush update" again.
|
|
|
|
|
pnpm-lock.yaml merge=binary
|
|
|
|
|
shrinkwrap.yaml merge=binary
|
|
|
|
|
npm-shrinkwrap.json merge=binary
|
|
|
|
|
yarn.lock merge=binary
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Rush's JSON config files use JavaScript-style code comments. The rule below prevents pedantic
|
|
|
|
|
# syntax highlighters such as GitHub's from highlighting these comments as errors. Your text editor
|
|
|
|
|
# may also require a special configuration to allow comments in JSON.
|
|
|
|
|
#
|
|
|
|
|
# For more information, see this issue: https://github.com/Microsoft/web-build-tools/issues/1088
|
|
|
|
|
#
|
|
|
|
|
*.json linguist-language=JSON-with-Comments
|
|
|
|
|
|
2019-04-10 19:01:57 +03:00
|
|
|
# Set the default behavior, in case people don't have core.autocrlf set.
|
|
|
|
|
* text=auto
|
2019-12-27 23:31:39 +03:00
|
|
|
|
|
|
|
|
# Mark recordings as auto generated
|
|
|
|
|
**/recordings/**/*.js linguist-generated=true
|
|
|
|
|
**/recordings/**/*.json linguist-generated=true
|
