gribse/achille-press
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix merge conflict.

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

4
header.php
View file

@ -2,7 +2,7 @@
/**
* The Header for our theme.
*
* Displays all of the <head> section and everything up till <div id="main">
* Displays all of the <head> section and everything up till <main id="main">
*
* @package _s
*/
@ -35,4 +35,4 @@
</nav><!-- #site-navigation -->
</header><!-- #masthead -->
<div id="main" class="site-main">
<div id="content" class="site-content">