Skip to content

Commit

Permalink
Merge branch 'lab-01-project-setup-solved' into lab-02-first-componen…
Browse files Browse the repository at this point in the history
…t-start

* lab-01-project-setup-solved:
  boom not Boom
  • Loading branch information
brucecoddington committed Mar 19, 2015
2 parents 5d69209 + 91cdd2d commit 602c1e4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion api/controllers/login.controller.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var Q = require('q');
var Boom = require('Boom');
var Boom = require('boom');
var Bcrypt = require('bcrypt');
var db = require('../services/db');
var props = require('../properties');
Expand Down

0 comments on commit 602c1e4

Please sign in to comment.