strongloop/loopback — pull request #184 by albertoleal (2014-02-17 15:56:11+00:00)
Title: Removing conflict lines

Just removing some conflict messages...