strongloop/loopback — pull request #185 by albertoleal (2014-02-17 16:27:15+00:00)
Title: Remove conflict lines

This PR removes some conflict messages.

As requested on #184, I'm updating the commit message.