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

diff --git a/glm-member-db/views/front/members/list.html b/glm-member-db/views/front/members/list.html
index c14ae96..7019133 100644 (file)
--- 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');
            }
         });