Skip to content

Commit

Permalink
Sync with "rush init --overwrite-existing --rush-example-repo" from R…
Browse files Browse the repository at this point in the history
…ush 5.6.3
  • Loading branch information
octogonz committed Mar 29, 2019
1 parent 51909f5 commit 04fd49a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
8 changes: 8 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,11 @@
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=JSON5
2 changes: 1 addition & 1 deletion rush.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* path segment in the "$schema" field for all your Rush config files. This will ensure
* correct error-underlining and tab-completion for editors such as VS Code.
*/
"rushVersion": "5.6.1",
"rushVersion": "5.6.3",

/**
* The next field selects which package manager should be installed and determines its version.
Expand Down

0 comments on commit 04fd49a

Please sign in to comment.