[freeside-commits] branch FREESIDE_4_BRANCH updated. 9ed21392289deb8f4f80bce4e501af66dd84ad8c

[Ivan]

The branch, FREESIDE_4_BRANCH has been updated
       via  9ed21392289deb8f4f80bce4e501af66dd84ad8c (commit)
      from  6961a8dafbc4e4afc6fa538ce7a2aaa3e31e70ae (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9ed21392289deb8f4f80bce4e501af66dd84ad8c
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Dec 14 09:24:01 2016 -0800

    eliminate warning about $conf redefinition

diff --git a/FS/FS/contact.pm b/FS/FS/contact.pm
index 2dbe548..e49f6df 100644
--- a/FS/FS/contact.pm
+++ b/FS/FS/contact.pm
@@ -888,8 +888,6 @@ sub send_reset_email {
 
   #email it
 
-  my $conf = new FS::Conf;
-
   my $cust_main = '';
   my @cust_contact = grep $_->selfservice_access, $self->cust_contact;
   $cust_main = $cust_contact[0]->cust_main if scalar(@cust_contact) == 1;

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/contact.pm |    2 --
 1 file changed, 2 deletions(-)