From 0f686ba7d471d936a6623000ecbe23c152f29500 Mon Sep 17 00:00:00 2001
From: Mark Wells <mark@freeside.biz>
Date: Mon, 21 Dec 2015 15:58:32 -0800
Subject: [PATCH] fix misplaced merge onto devel branch, #32250

---
 FS/FS/Conf.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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',
-- 
2.11.0