Resolve merge conflict in LICENSE file

thoughtbot / carnival

An unobtrusive, developer-friendly way to add comments

MIT License

499 stars 30 forks source link

Resolve merge conflict in LICENSE file #117

Closed teddywing closed 9 years ago

teddywing commented 9 years ago

Currently looks like this:

<<<<<<< HEAD

LICENSE

The MIT License

Copyright (c) 2008-2014 Jon Yurek and thoughtbot, inc.
=======
The MIT License (MIT)

Copyright (c) 2014 thoughtbot <hello@thoughtbot.com>
>>>>>>> Add MIT license

pbrisbin commented 9 years ago

Thanks for letting us know.

@cpytel / @jferris : is there a legal reason to have Jon in the copyright, or should I resolve the other way?

cpytel commented 9 years ago

This looks like I probably copied it from Paperclip accidentally. It can be removed.