diff options
| author | Jade Dominguez <plusjade@gmail.com> | 2012-01-12 23:32:41 -0800 |
|---|---|---|
| committer | Jade Dominguez <plusjade@gmail.com> | 2012-01-12 23:32:41 -0800 |
| commit | a7608142e282230f3a1c7f7961231d427e9cf2b6 (patch) | |
| tree | 0d225bb3999b446262d708f44c511f7c7ce25626 /_config.yml | |
| parent | e34311ddedc6c0e3481971985e67451921a6a82c (diff) | |
| parent | 72f569454266345a1ede3829bfe07b6b7d14fcff (diff) | |
fix merge conflict
Diffstat (limited to '_config.yml')
0 files changed, 0 insertions, 0 deletions