From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 7 Apr 2016 14:03:10 +0000 (-0400)
Subject: Removed merge symbols
X-Git-Tag: v1.0.0^2~108^2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=8214c81f4b8af979940ff5b0ef18d430a94b58fb;p=WP-Themes%2Fgaslightmedia.git

Removed merge symbols
---

diff --git a/front-page.php b/front-page.php
index cbb7264..ed39054 100644
--- a/front-page.php
+++ b/front-page.php
@@ -1,10 +1,7 @@
 <?php get_header(); ?>
 <main class="page-front">
     <?php get_template_part('parts/slide-show');?>
-<<<<<<< HEAD
-=======
     <?php get_template_part('parts/statements');?>
->>>>>>> Plugin styles, statements on other pages
     <div id="content-wrapper">
         <div class="row">
             <?php