From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 13 Apr 2017 13:49:11 +0000 (-0400)
Subject: Removed leftover git conflict indicators
X-Git-Tag: v1.0.0^2~49
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=52a8ec3b11d41b456478931c8f1e175d802cac74;p=WP-Themes%2Fbrewbakers.git

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
--- 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() {