diff options
| author | Mark Wells <mark@freeside.biz> | 2015-12-21 15:58:32 -0800 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2015-12-22 01:03:05 -0800 |
| commit | 0f686ba7d471d936a6623000ecbe23c152f29500 (patch) | |
| tree | 0d5630c3f8a0bac8c4b60a9aa5134f1c1a32c3fd | |
| parent | d102d05f9b43d77870d5a0ebdb93bf743f479e8d (diff) | |
fix misplaced merge onto devel branch, #32250
| -rw-r--r-- | FS/FS/Conf.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm index eec719a36..7dbc2ebf2 100644 --- a/FS/FS/Conf.pm +++ b/FS/FS/Conf.pm @@ -4289,7 +4289,6 @@ and customer address. Include units.', 'section' => 'invoicing', 'description' => 'Instead of showing payments (and credits) applied to the invoice, show those received since the previous invoice date.', 'type' => 'checkbox', - 'uscensus' => 'U.S. Census Bureau', }, { @@ -4322,6 +4321,7 @@ and customer address. Include units.', 'description' => 'Method for standardizing customer addresses.', 'type' => 'select', 'select_hash' => [ '' => '', + 'uscensus' => 'U.S. Census Bureau', 'usps' => 'U.S. Postal Service', 'tomtom' => 'TomTom', 'melissa' => 'Melissa WebSmart', |