RT#71890: SelfService API: Return monthly recurring fee [display_recurring, v4 reconc...

diff --git a/FS/FS/cust_main/Packages.pm b/FS/FS/cust_main/Packages.pm
index ace30d3..83ad7db 100644 (file)
--- 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