fixing merge conflict

2016-11-24 10:30:52 +01:00 · 2016-11-24 10:30:52 +01:00 · b4c2801df6
parent 56940ee656
commit b4c2801df6
1 changed files with 3 additions and 0 deletions
--- a/home.php
+++ b/home.php
@ -31,8 +31,11 @@ if ( is_front_page() && is_home() ) {

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

 					<?php if ( have_posts() ) : ?>