Removed merge symbols

diff --git a/front-page.php b/front-page.php
index cbb7264..ed39054 100644 (file)
--- 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