From 979fd02b54579a289e62fcc93ef24490425f815a Mon Sep 17 00:00:00 2001
From: Jonathan Prykop <jonathan@freeside.biz>
Date: Wed, 31 Aug 2016 21:58:58 -0500
Subject: [PATCH] RT#71890: SelfService API: Return monthly recurring fee
 [display_recurring, v4 reconcile bug fix]

---
 FS/FS/cust_main/Packages.pm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/FS/FS/cust_main/Packages.pm b/FS/FS/cust_main/Packages.pm
index ace30d3d2..83ad7dbe6 100644
--- a/FS/FS/cust_main/Packages.pm
+++ b/FS/FS/cust_main/Packages.pm
@@ -882,7 +882,6 @@ sub display_recurring {
   } #foreach $freq
 
   return @out;
->>>>>>> 4b56fbb... RT#71890: SelfService API: Return monthly recurring fee [display_recurring]
 }
 
 =back
-- 
2.11.0