Skip to content

Commit

Permalink
docs(contribute): resolves merge conflicts
Browse files Browse the repository at this point in the history
trying to resolve merge conflicts
  • Loading branch information
pranshuchittora committed Apr 22, 2019
1 parent 59eea60 commit 73ed3c1
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions .github/CONTRIBUTING.md
Expand Up @@ -180,6 +180,7 @@ In case you are suggesting a new feature, we will match your idea with our curre
yarn lint && yarn tslint
```


## Editor Config

The [.editorconfig](https://github.com/webpack/webpack-cli/blob/master/.editorconfig) in the root should ensure consistent formatting. Please make sure you've [installed the plugin](http://editorconfig.org/#download) if your text editor needs one.
Expand Down

0 comments on commit 73ed3c1

Please sign in to comment.