Fixed commit merge conflict.

sethlilly / Vapor

A minimal, responsive theme for Ghost.

MIT License

544 stars 214 forks source link

Closed toonketels closed 10 years ago

toonketels commented 10 years ago

The footer of the 1.4 branch displays some leftovers of a git merge conflict. Removed it.

sethlilly commented 10 years ago

Good catch. This wasn't in master, so I missed it. Need to go back through and tag these releases. :) Thanks for your help!