rayelliott
/
understrap
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixing merge conflict

This commit is contained in:
koenemann 2016-11-24 10:30:52 +01:00
parent 56940ee656
commit b4c2801df6
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
home.php
View File

@ -31,8 +31,11 @@ if ( is_front_page() && is_home() ) {
<!-- Do the left sidebar check --> <!-- Do the left sidebar check -->
<?php get_template_part( 'global-templates/left-sidebar-check', 'none' ); ?> <?php get_template_part( 'global-templates/left-sidebar-check', 'none' ); ?>
<?php if ( 'masonry' === $posts_style ) : ?> <?php if ( 'masonry' === $posts_style ) : ?>
<div class="card-columns"><?php endif; ?> <div class="card-columns"><?php endif; ?>
<main class="site-main" id="main"> <main class="site-main" id="main">
<?php if ( have_posts() ) : ?> <?php if ( have_posts() ) : ?>