admin/jasmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #818 from lpww/patch-1

Browse Source 
Update formatting
This commit is contained in:
Gregg Van Hove
2015-04-05 21:56:59 -07:00
parent 2d5c071d28 d7dd85c64f
commit 7cd8c41d31
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CONTRIBUTING.md
View File

@@ -123,8 +123,8 @@ Jasmine uses the [Jasmine NPM package](http://github.com/jasmine/jasmine-npm) to
## Submitting a Pull Request ## Submitting a Pull Request
1. Revert your changes to `jasmine.js` and `jasmine-html.js` 1. Revert your changes to `jasmine.js` and `jasmine-html.js`
* We do this because `jasmine.js` and `jasmine-html.js` are auto-generated (as you've seen in the previous steps) and accepting multiple pull requests when this auto-generated file changes causes lots of headaches. * We do this because `jasmine.js` and `jasmine-html.js` are auto-generated (as you've seen in the previous steps) and accepting multiple pull requests when this auto-generated file changes causes lots of headaches
1. When we accept your pull request, we will generate these files as a separate commit and merge the entire branch into master. 1. When we accept your pull request, we will generate these files as a separate commit and merge the entire branch into master
Note that we use Travis for Continuous Integration. We only accept green pull requests. Note that we use Travis for Continuous Integration. We only accept green pull requests.