Li-Wen Yip 027faa06a2 Resolve conflicts with remote-tracking branch 'refs/remotes/halogenica/master' ... # Conflicts: # exampleSite/config.toml # exampleSite/content/page/about.md # layouts/_default/list.html # layouts/partials/disqus.html # layouts/partials/head.html # layouts/partials/header.html # layouts/partials/page.html # layouts/partials/post.html		2017-03-08 19:03:10 +00:00
..
_default	Resolve conflicts with remote-tracking branch 'refs/remotes/halogenica/master'	2017-03-08 19:03:10 +00:00
partials	Resolve conflicts with remote-tracking branch 'refs/remotes/halogenica/master'	2017-03-08 19:03:10 +00:00
404.html	Correct spacing and remove extraneous </div>	2017-03-06 13:36:42 -08:00
index.html	Resolve conflicts with remote-tracking branch 'refs/remotes/halogenica/master'	2017-03-08 19:03:10 +00:00