Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniel James committed Feb 14, 2017
2 parents ff8910b + 2db89df commit b1c1622
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ Please note we have a code of conduct, please follow it in all your interactions
2. Ensure that new functionality is covered by unit tests, and that the full suite of tests passes.
3. Update the [README](README.md) with details of changes to the interface, this includes new environment
variables, exposed ports, useful file locations and container parameters.
4. Increase the version numbers in any examples files and the README.md to the new version that this
Pull Request would represent. The versioning scheme we use is [SemVer](http://semver.org/).
5. You may merge the Pull Request in once you have the sign-off of two other developers, or if you
4. You may merge the Pull Request in once you have the sign-off of two other developers, or if you
do not have permission to do that, you may request the second reviewer to merge it for you.

## Code of Conduct
Expand Down

0 comments on commit b1c1622

Please sign in to comment.