Fix merge conflict.

This commit is contained in:
David A. Kennedy 2013-08-23 23:58:40 -04:00
commit 22e859857e
19 changed files with 61 additions and 112 deletions

View file

@ -8,7 +8,7 @@
*/
?>
</div><!-- #main -->
</div><!-- #content -->
<footer id="colophon" class="site-footer" role="contentinfo">
<div class="site-info">