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 (file)
--- 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}