From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 29 Aug 2018 15:54:27 +0000 (-0400)
Subject: Fix conflict in list view
X-Git-Tag: v2.10.39^2~5
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=4687a77d1c1a674a58a9b3c0134d4aff4fdc5824;p=WP-Plugins%2Fglm-member-db.git

Fix conflict in list view

on develop branch
---

diff --git a/views/front/members/list.html b/views/front/members/list.html
index d6ac5def..e8efa555 100755
--- a/views/front/members/list.html
+++ b/views/front/members/list.html
@@ -572,7 +572,6 @@
                 });
               {/if}
 
-<<<<<<< HEAD
                 var mapContainerWidth = Number(leafletMap._container.clientWidth);
                 var maxPopupWidth = .65 * mapContainerWidth;
                 if (maxPopupWidth > 600) {
@@ -580,8 +579,6 @@
                 }
                 var mapContainerHeight = Number(leafletMap._container.clientHeight);
                 var maxPopupHeight = .7 * mapContainerHeight;
-=======
->>>>>>> v2.10.38
 
               {foreach $mapItems as $m}
                 {if $m.lat != 0 && $m.lon != 0}