Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/dc-js/dc.js
Browse files Browse the repository at this point in the history
  • Loading branch information
gordonwoodhull committed Dec 5, 2014
2 parents 2352670 + beaaf35 commit b7da957
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@
* Make changes to the files in `src/` not dc.js
* Add tests to `spec/`. Feel free to create a new file if needed.
* Run `grunt server` and go to http://localhost:8888/spec to develop your tests.
* Run `grunt lint` to fix any final linting issues via jshint.
* Run `grunt lint` to confirm that your code meets the dc.js style guidelines.
* Run `grunt test` to confirm that all tests will pass on phantomjs.
* Run `grunt jshint` and `grunt jscs` to confirm that your code meets the dc.js style guidelines
* Commit your changes to `src/*` and `spec/*` but not any build artifacts. (Build artifacts include `dc.*js*`, `web/docs/*`, `web/js/*`)
* Submit a pull request
* If you merge master or another branch into your patchset, please rebase against master.
Expand Down

0 comments on commit b7da957

Please sign in to comment.