From: Jonathan Prykop <jonathan@freeside.biz>
Date: Thu, 1 Sep 2016 02:58:58 +0000 (-0500)
Subject: RT#71890: SelfService API: Return monthly recurring fee [display_recurring, v4 reconc... 
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=979fd02b54579a289e62fcc93ef24490425f815a;p=freeside.git

RT#71890: SelfService API: Return monthly recurring fee [display_recurring, v4 reconcile bug fix]
---

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