From acfabdcb0b0632fbe693a09c71b5bdad77124e07 Mon Sep 17 00:00:00 2001
From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Fri, 14 Apr 2017 10:49:19 -0400
Subject: [PATCH] fixing merge conflict

replacing Laury's original merge where he removed the js statement that moved
the sale price next to the msrp price in list view theme file
---
 glm-member-db/views/front/members/list.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/glm-member-db/views/front/members/list.html b/glm-member-db/views/front/members/list.html
index c14ae96..7019133 100644
--- a/glm-member-db/views/front/members/list.html
+++ b/glm-member-db/views/front/members/list.html
@@ -389,7 +389,7 @@
         $('.glm-member-list-record').each(function(){
            if( $(this).find('.slash-price').length != 0 ){
                $(this).find('.msrp-value').addClass('sale');
-               $(this).find( $('.sale-price-value') ).insertAfter( $(this).find('.sale') ).css('display', 'block').css('float', 'right').addClass('sale-text');
+//               $(this).find( $('.sale-price-value') ).insertAfter( $(this).find('.sale') ).css('display', 'block').css('float', 'right').addClass('sale-text');
            }
         });
 
-- 
2.17.1