Skip to content

Commit

Permalink
GitHub
Browse files Browse the repository at this point in the history
  • Loading branch information
dwijnand committed Jan 31, 2019
1 parent 90c9f47 commit 8aa9209
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion docs/faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ it, considering
1. Proper formatting
[helps you catch bugs](https://twitter.com/extempore2/status/717716747181096960)!

2. You can enable non-whitespace diffs during code review. For Github, add
2. You can enable non-whitespace diffs during code review. For GitHub, add
`?w=1` to the URL to ignore whitespace changes.

3. `git blame` has a `-w` flag to ignore whitespace changes so you can still
Expand Down
2 changes: 1 addition & 1 deletion scalafmt-intellij-plugin/META-INF/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<change-notes><![CDATA[
<ul>
<li>See full changelog at <a href="http<!---->s://olafurpg.github.io/scalafmt/#Changelog">scalafmt.org</a>.</li>
<li>Please report any bugs <a href="http://github.com/scalameta/scalafmt/issues">on Github</a>.</li>
<li>Please report any bugs <a href="http://github.com/scalameta/scalafmt/issues">on GitHub</a>.</li>
<li>Default shortcut is now shift+ctrl+L.
Customize the shortcut under Settings > Keymap.
Action is "Reformat with scalafmt".
Expand Down

0 comments on commit 8aa9209

Please sign in to comment.