From: Nick Downie Date: Wed, 2 Jul 2014 20:39:44 +0000 (+0100) Subject: Mention not committing built files in README.md X-Git-Tag: v1.0.1-beta.2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95844701bd235a42dd99180a6543e0166f5d8d70;p=thirdparty%2FChart.js.git Mention not committing built files in README.md --- diff --git a/README.md b/README.md index 86d7c4c09..96c9cefc9 100644 --- a/README.md +++ b/README.md @@ -22,4 +22,5 @@ New contributions to the library are welcome, just a couple of guidelines: - Please ensure you're changing the individual files in `/src`, not the concatenated output in the `Chart.js` file in the root of the repo. - Please check that your code will pass `jshint` code standards, `gulp jshint` will run this for you. - Please keep pull requests concise, and document new functionality in the relevant `.md` file. -- Consider whether your changes are useful for all users, or if creating a Chart.js extension would be more appropriate. \ No newline at end of file +- Consider whether your changes are useful for all users, or if creating a Chart.js extension would be more appropriate. +- Please avoid committing in the build Chart.js & Chart.min.js file, as it causes conflicts when merging.