Update validators.py

ckan · Nov 15, 2019 · 68ed0bd · 68ed0bd
1 parent 76e1e6c
commit 68ed0bd
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/ckan/logic/validators.py b/ckan/logic/validators.py
@@ -1,7 +1,4 @@
-<<<<<<< HEAD
 
-=======
->>>>>>> 5021e632b0c0e434e00f100e3c68a1ec4ab9558c
 # encoding: utf-8
 
 import collections
@@ -869,7 +866,7 @@ def one_of(list_of_value):
    '''
    def callable(value):
       if value not in list_of_values:
-	raise Invalid(_('Value must be one of {}'.format(list_of_value)))
+	      raise Invalid(_('Value must be one of {}'.format(list_of_value)))
       return value