Resolve conflicts, bring up to date with master

Cadasta · Jan 3, 2017 · 8035f8c · 8035f8c
1 parent 407449b
commit 8035f8c
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/cadasta/config/settings/default.py b/cadasta/config/settings/default.py
@@ -512,3 +512,8 @@
     'django.contrib.auth.hashers.BCryptSHA256PasswordHasher',
     'django.contrib.auth.hashers.BCryptPasswordHasher',
 ]
+
+IMPORTERS = {
+    'csv': 'organization.importers.csv.CSVImporter',
+    'xls': 'organization.importers.xls.XLSImporter'
+}