remove payment deletion, RT#37908

diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html
index b6d1f95..d81fe99 100644 (file)
--- a/httemplate/view/cust_main/payment_history.html
+++ b/httemplate/view/cust_main/payment_history.html
@@ -230,13 +230,8 @@ my %opt = (
         'Apply payment', 'Refund credit card payment', 'Refund Echeck payment',
         'Post refund', 'Post check refund', 'Post cash refund ', 'Refund payment',
         'Credit card void', 'Echeck void', 'Void payments', 'Unvoid payments',
-<<<<<<< HEAD
-        'Delete payment', 'Unapply payment',
-        'Apply credit', 'Delete credit', 'Unapply credit', 'Void credit', 'Unvoid credit',
-=======
         'Unapply payment',
         'Apply credit', 'Unapply credit', 'Void credit', 'Unvoid credit',
->>>>>>> 727d620... remove payment deletion, RT#37908
         'Delete refund',
         'Billing event reports', 'View customer billing events',
       )