diff options
| author | Mark Otto <[email protected]> | 2013-04-20 12:13:05 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-04-20 12:13:05 -0700 |
| commit | e60c07327b0b5d4ff6700b8848ba77c3040144d5 (patch) | |
| tree | 966cd4c49d2249dc7ab4e47b056ce5b49dd60d1f | |
| parent | ba7d928c37706aabcd1b39daaa99ea30d7c6ca7a (diff) | |
| parent | 496f1933bb5a3572f50bbb972124770e71c56e48 (diff) | |
| download | bootstrap-e60c07327b0b5d4ff6700b8848ba77c3040144d5.tar.xz bootstrap-e60c07327b0b5d4ff6700b8848ba77c3040144d5.zip | |
Merge branch 'reversefold-master' into 3.0.0-wip
Conflicts:
README.md
| -rw-r--r-- | README.md | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -58,7 +58,7 @@ When completed, you'll be able to run the various make commands provided: Runs jshint and qunit tests headlessly in [phantomjs](http://code.google.com/p/phantomjs/) (used for ci). **Requires phantomjs.** #### watch - `make watch` -This is a convenience method for watching just Less files and automatically building them whenever you save. **Requires the Watchr gem.** +This is a convenience method for watching just Less files and automatically building them whenever you save. **Requires the watchr gem.** Should you encounter problems with installing dependencies or running the makefile commands, uninstall any previous versions (global and local) you may have installed, and then rerun `npm install`. |