Skip to content

Commit

Permalink
Merge pull request #571 from mesosphere/update-contributing
Browse files Browse the repository at this point in the history
Update CONTRIBUTING.md with coding guidelines
  • Loading branch information
Poltergeist committed Jan 21, 2016
2 parents 5bb7c41 + 69b4a78 commit 4afbd95
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ If you want to add a new npm package to 'node_modules':

npm shrinkwrap --dev

#### <a name="guidelines"></a> Coding Guidelines
#### Editor Configuration

There is an ```.editorconfig```-file to apply editor settings on various editors.

Expand All @@ -75,6 +75,8 @@ There is an ```.editorconfig```-file to apply editor settings on various editors
1. Installing SublimeLinter is straightforward using Sublime Package Manager, see [instructions](http://sublimelinter.readthedocs.org/en/latest/installation.html#installing-via-pc)
2. Follow the instructions for [SublimeLinter-eslint](https://github.com/roadhump/SublimeLinter-eslint)

#### Coding Guidelines
Follow our [Coding Guidelines](https://github.com/mesosphere/marathon-ui/blob/master/coding-guidelines.md)

#### Submitting a Pull Request
Before you submit your pull request consider the following guidelines:
Expand All @@ -89,8 +91,6 @@ Before you submit your pull request consider the following guidelines:

* Create your patch, including [appropriate test cases](#testing)

* Follow our [Coding Guidelines](#guidelines)

* Commit your changes using a descriptive commit message

* Build your changes locally to ensure all the tests pass:
Expand Down

0 comments on commit 4afbd95

Please sign in to comment.