Fix merge conflict.
This commit is contained in:
commit
22e859857e
19 changed files with 61 additions and 112 deletions
|
@ -8,7 +8,7 @@
|
|||
*/
|
||||
?>
|
||||
|
||||
</div><!-- #main -->
|
||||
</div><!-- #content -->
|
||||
|
||||
<footer id="colophon" class="site-footer" role="contentinfo">
|
||||
<div class="site-info">
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue