mirror of
https://github.com/hcengineering/platform.git
synced 2026-08-17 18:05:42 +02:00
Denis Bykhov
2b0d510202
git-subtree-dir: foundations/server git-subtree-mainline:fd0b7130ebgit-subtree-split:afe85b988c
15 lines
735 B
Plaintext
15 lines
735 B
Plaintext
# 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=text
|
|
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/rushstack/issues/1088
|
|
#
|
|
*.json linguist-language=JSON-with-Comments
|