Conflict

1 files changed, 2 insertions, 2 deletions

diff --git a/wqflask/utility/tools.py b/wqflask/utility/tools.py
index 955f3bdd..6e9f6d4a 100644
--- a/wqflask/utility/tools.py
+++ b/wqflask/utility/tools.py
@@ -35,7 +35,7 @@ def get_setting(command_id,guess=None):
             return command
         else:
             return None
-    
+
     # ---- Check whether environment exists
     # sys.stderr.write("Looking for "+command_id+"\n")
     command = value(os.environ.get(command_id))
@@ -128,7 +128,7 @@ def locate_ignore_error(name, subdir=None):
 
 def tempdir():
     return valid_path(get_setting("TEMPDIR","/tmp"))
-    
+
 # Cached values
 WEBSERVER_MODE     = get_setting('WEBSERVER_MODE')
 LOGGING            = get_setting('LOGGING')