| commit | 5ec5d054c2cb7bd2f60d12edfc54f48185068e78 | |
| author | Barry Clark <barry@barryclark.co> | |
| Sun, 1 Jun 2014 19:23:07 +0000 (1 15:23 -0400) | ||
| committer | Barry Clark <barry@barryclark.co> | |
| Sun, 1 Jun 2014 19:23:07 +0000 (1 15:23 -0400) | ||
| tree | 8d3b7cd7a7f6d0ee01fc6d3802f02bdcc9effe1f | treesnapshot (tar.gz zip) |
| parent | df705f6cec60f574c886916201bfcb51eaf03ff2 | commitdiff |
| parent | 583c861729832e9952f146a0915461ac96760638 | commitdiff |
I am terrible at using git commit --amend
Merge branch 'master' of github.com:barryclark/jekyll-now
Conflicts:
_config.yml
Merge branch 'master' of github.com:barryclark/jekyll-now
Conflicts:
_config.yml