From e6c54cd41c23d8c0da9d5e0f66c20a571470d435 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Thu, 23 Sep 2010 21:27:36 +0000
Subject: [PATCH] fix bad conflict resolution between ivan's and jeff's idea of
 how to use a different freq

---
 FS/FS/part_pkg.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index b267a62f4..85269c5a6 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -823,7 +823,7 @@ argument.
 
 sub add_freq {
   my( $self, $date, $freq ) = @_;
-  $freq = $self->freq if !defined($freq);
+  $freq = $self->freq unless $freq;
 
   #change this bit to use Date::Manip? CAREFUL with timezones (see
   # mailing list archive)
-- 
2.11.0