From b4c2801df6850c264f44b80ba2838260836a31c2 Mon Sep 17 00:00:00 2001
From: koenemann <office@holgerkoenemann.de>
Date: Thu, 24 Nov 2016 10:30:52 +0100
Subject: [PATCH] fixing merge conflict

---
 home.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/home.php b/home.php
index d6c26d7..6f43a8c 100644
--- 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() ) : ?>