summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Kohler <ivan@freeside.biz>2015-12-26 12:34:22 -0800
committerIvan Kohler <ivan@freeside.biz>2015-12-26 12:34:22 -0800
commit5a0e11b8136c2138b8044c3d1343b9ae4fafd38c (patch)
treebb581041e25e88f13a6fdddaa5a60600ff589d92
parentdd003d59f56742f9374cec309ad81d527e88c846 (diff)
fix mis-application of mis-application merge? wtf? 32250
-rw-r--r--FS/FS/Conf.pm1
1 files changed, 0 insertions, 1 deletions
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index e066225c0..7dbc2ebf2 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',
],