[freeside-commits] branch master updated. 5a0e11b8136c2138b8044c3d1343b9ae4fafd38c

[Ivan]

The branch, master has been updated
       via  5a0e11b8136c2138b8044c3d1343b9ae4fafd38c (commit)
      from  dd003d59f56742f9374cec309ad81d527e88c846 (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 5a0e11b8136c2138b8044c3d1343b9ae4fafd38c
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Dec 26 12:34:22 2015 -0800

    fix mis-application of mis-application merge?  wtf?  32250

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index e066225..7dbc2eb 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -4323,7 +4323,6 @@ and customer address. Include units.',
     'select_hash' => [ '' => '', 
                        'uscensus' => 'U.S. Census Bureau',
                        'usps'     => 'U.S. Postal Service',
-                       'uscensus' => 'U.S. Census Bureau',
                        'tomtom'   => 'TomTom',
                        'melissa'  => 'Melissa WebSmart',
                      ],

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

Summary of changes:
 FS/FS/Conf.pm |    1 -
 1 file changed, 1 deletion(-)