smashwilson/merge-conflicts — pull request #46 by smashwilson (2014-04-25 14:28:35+00:00)
Title: Travis CI

Enable Travis builds for merge-conflicts with [atom/ci](https://github.com/atom/ci). :metal: