Merge /home/zas1024/gene

Conflicts:
	wqflask/wqflask/views.py

1 files changed, 5 insertions, 3 deletions

diff --git a/wqflask/maintenance/quick_search_table.py b/wqflask/maintenance/quick_search_table.py
index eef61857..f0075df0 100644
--- a/wqflask/maintenance/quick_search_table.py
+++ b/wqflask/maintenance/quick_search_table.py
@@ -13,8 +13,10 @@ each trait, its dataset, and several columns determined by its trait type (pheno
 
 from __future__ import absolute_import, division, print_function
 
-#import sys
-#sys.path.append("../../..")
+	# We do this here so we can use zach_settings
+# Not to avoid other absoulte_imports
+import sys
+sys.path.append("../../..")
 
 import simplejson as json
 
@@ -504,4 +506,4 @@ def main():
     ProbeSetXRef.run()
 
 if __name__ == "__main__":
-    main()
\ No newline at end of file
+    main()