Removed leftover git conflict indicators

diff --git a/glm-member-db/views/front/members/detail.html b/glm-member-db/views/front/members/detail.html
index dd36c67..0d704b5 100644 (file)
--- a/glm-member-db/views/front/members/detail.html
+++ b/glm-member-db/views/front/members/detail.html
@@ -433,11 +433,7 @@
                 $("#"+target+"-toggle").toggleClass("selected");
                 fullProfileCheck(target);
             });
-<<<<<<< Updated upstream
-
-=======
-
->>>>>>> Stashed changes
+            
             // Open all tabs by default on page load, but only in large-view
             if ($(window).width() >= 1024) {
                 $('.glm-member-detail-sub-data-links').each(function() {