From 4687a77d1c1a674a58a9b3c0134d4aff4fdc5824 Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Wed, 29 Aug 2018 11:54:27 -0400 Subject: [PATCH] Fix conflict in list view on develop branch --- views/front/members/list.html | 3 --- 1 file changed, 3 deletions(-) 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} -- 2.17.1