From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Tue, 31 Oct 2017 15:14:46 +0000 (-0400)
Subject: removing git conflict text
X-Git-Tag: v1.0.0^2~88
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=06356d01205e1bd103da7d1bfd6289c2caddc4ac;p=WP-Themes%2Fmeetingsmichigan.git

removing git conflict text

removing the the git conflict text from files that had merge conflicts
---

diff --git a/glm-member-db/views/front/members/list.html b/glm-member-db/views/front/members/list.html
index 85ab34e..f376002 100644
--- a/glm-member-db/views/front/members/list.html
+++ b/glm-member-db/views/front/members/list.html
@@ -5,11 +5,7 @@
                 {$featuredImage = ''}
                 <li class="topbar-member">
                     {$featured = apply_filters('member_images',$member.id,true)} 
-<<<<<<< Updated upstream
-        
-=======
-                    
->>>>>>> Stashed changes
+
                     {foreach $featured as $feature}
                         {if $feature.featured.value}
                             {$featuredImage = $feature.file_name}