Skip to content

Commit

Permalink
Merge 263280c into 7541698
Browse files Browse the repository at this point in the history
  • Loading branch information
jorgecid committed Dec 14, 2013
2 parents 7541698 + 263280c commit 9751fd4
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -302,7 +302,7 @@ your `node_modules` folder, and `require` calls can be made in global-style
regardless of which file is requiring it:

````coffeescript
Controller = require 'myfraework/lib/controller'
Controller = require 'myframework/lib/controller'
````

Note that:
Expand Down Expand Up @@ -548,4 +548,4 @@ COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/polvo/polvo/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/polvo/polvo/trend.png)](https://bitdeli.com/free "Bitdeli Badge")

0 comments on commit 9751fd4

Please sign in to comment.