incorporated the changes

ckan · Nov 13, 2019 · 01383c3 · 01383c3
2 parents bdf0e78 + 5021e63
commit 01383c3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/ckan/logic/__init__.py b/ckan/logic/__init__.py
@@ -1,4 +1,4 @@
-g encoding: utf-8
+# encoding: utf-8
 
 import functools
 import logging
@@ -674,7 +674,7 @@ def get_validator(validator):
         _validators_cache.update(validators)
         validators = _import_module_functions('ckan.logic.validators')
         _validators_cache.update(validators)
-        _validators_cache.update({'OneOf': ckan.logic.validators.one_of})
+        _validators_cache.update({'OneOf':'ckan.logic.validators.one_of'})
         converters = _import_module_functions('ckan.logic.converters')
         _validators_cache.update(converters)
 

diff --git a/ckan/logic/validators.py b/ckan/logic/validators.py
@@ -1,4 +1,7 @@
+<<<<<<< HEAD
 
+=======
+>>>>>>> 5021e632b0c0e434e00f100e3c68a1ec4ab9558c
 # encoding: utf-8
 
 import collections

diff --git a/ckan/tests/logic/test_validators.py b/ckan/tests/logic/test_validators.py
@@ -1,4 +1,7 @@
+<<<<<<< HEAD
 
+=======
+>>>>>>> 5021e632b0c0e434e00f100e3c68a1ec4ab9558c
 # encoding: utf-8
 
 '''Unit tests for ckan/logic/validators.py.