diff options
author | jeff <jeff> | 2010-09-23 21:27:36 +0000 |
---|---|---|
committer | jeff <jeff> | 2010-09-23 21:27:36 +0000 |
commit | e6c54cd41c23d8c0da9d5e0f66c20a571470d435 (patch) | |
tree | ea15e99db1c268ee8f18015ee5dfddf131fbd7ea | |
parent | 4f3925e2d4db8181b70e9c04bf95f31760a8f7e2 (diff) |
fix bad conflict resolution between ivan's and jeff's idea of how to use a different freq
-rw-r--r-- | FS/FS/part_pkg.pm | 2 |
1 files changed, 1 insertions, 1 deletions
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) |