From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Mon, 12 Jun 2017 15:14:05 +0000 (-0400)
Subject: removing stashed changes from previous commit
X-Git-Tag: v1.0.0^2~11
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=c861cf1226e837d7399cf9e1e8834d7e69bfcd4c;p=WP-Themes%2Fphsacf.git

removing stashed changes from previous commit

conflicts were pushed in previous commit, removing the stashed changes text from interior page
---

diff --git a/sections/interior-page.php b/sections/interior-page.php
index babe700..f0de0be 100644
--- a/sections/interior-page.php
+++ b/sections/interior-page.php
@@ -1,11 +1,9 @@
                     <main class="page-inside">
                         <div id="content-wrapper">
                             <div class="row large-collapse">
-<<<<<<< Updated upstream
                                  
                               <?php
                                if (get_page_template_slug( $post->ID ) === "members-only-template.php") {  ?>
-                            
                                     <div class="members-only-template large-push-4 large-8 columns" data-equalizer-watch>
                                             <?php if (is_user_logged_in()) { ?>
                                                 <!-- If user is logged in as a member, display top bar, bread crumbs, & content -->
@@ -37,20 +35,6 @@
                                             <?php get_template_part('parts/main-content');?>
                                         </div>
                                 <?php } ?>
-                                
-=======
-                                <div class="small-12 large-push-4 large-8 columns">
-                                    <?php if(function_exists('bcn_display') && !is_front_page())
-                                        {
-                                            echo "<div class=\"breadcrumbs small-12 columns\">"; 
-                                            bcn_display();
-                                            echo "</div>";
-                                        }
-                                        ?>
-                                        <?php get_template_part('parts/main-content');?>
-                                </div>
-<!--                                 <?php get_template_part('parts/donate'); ?>-->
->>>>>>> Stashed changes
                                 <div id="side-content" class=" text-center small-12 large-pull-8 large-4 columns large-text-left">
                                    <?php if (get_page_template_slug( $post->ID ) === "members-only-template.php") {  ?>
                                    <div id="sidebar" class="small-12" data-equalizer-watch>