search

bmcmurray / hekyll

a Jekyll generator for Impress.js presentations
bmcmurray.github.com/hekyll
MIT License
241 stars 51 forks source link

Sync gh-pages with master #5

Closed smerrill closed 12 years ago

smerrill commented 12 years ago

As I mentioned in #4, GitHub will run Jekyll for us until we do something that takes us outside the realm of normal Jekyll, so why not sync up master and gh-pages now that master has the gh-pages-source branch in it?

(See also http://smerrill.github.com/hekyll/ - hooray!)

bmcmurray commented 12 years ago

This won't merge cleanly, can you update from upstream and try again?

smerrill commented 12 years ago

I have tried, even up to a git reset --hard upstream/master, but to no avail - I think we may have to push this one by hand.