search

sethlilly / Vapor

A minimal, responsive theme for Ghost.
MIT License
544 stars 214 forks source link

Removing leftover merge conflict #27

Closed andyleejordan closed 10 years ago

andyleejordan commented 10 years ago

So there was a merge conflict still in the code of this release, in the footer of the site. Kinda funky looking. This removes it.

sethlilly commented 10 years ago

Thanks, @andschwa! I was updating hipsterghost.com and Vapor core at the same time. I knew I'd miss something. :+1:

andyleejordan commented 10 years ago

No problem! I like the theme.

On Apr 19, 2014, at 10:00 PM, Seth Lilly notifications@github.com wrote:

Thanks, @andschwa! I was updating hipsterghost.com and Vapor core at the same time. I knew I'd miss something.

— Reply to this email directly or view it on GitHub.

sethlilly commented 10 years ago

Right on! Thanks for contributing.