diff options
| author | Zachary Sloan | 2013-10-11 14:17:50 -0500 |
|---|---|---|
| committer | Zachary Sloan | 2013-10-11 14:17:50 -0500 |
| commit | 51be798ef6311a86ea1ca8c5092277d727b98a5a (patch) | |
| tree | 8471652f8eeb92bbcbdf5b7193b649de3716a0bb /wqflask/maintenance | |
| parent | 3325184b1dd310619626dd31852ab84cae6dc7fc (diff) | |
| parent | 8a09358e98dbf88deb101d13107a40bac371de5c (diff) | |
| download | genenetwork2-51be798ef6311a86ea1ca8c5092277d727b98a5a.tar.gz | |
Merge /home/lei/gene
Conflicts:
wqflask/maintenance/quick_search_table.py
Diffstat (limited to 'wqflask/maintenance')
| -rw-r--r-- | wqflask/maintenance/quick_search_table.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wqflask/maintenance/quick_search_table.py b/wqflask/maintenance/quick_search_table.py index 23bd505c..f0075df0 100644 --- a/wqflask/maintenance/quick_search_table.py +++ b/wqflask/maintenance/quick_search_table.py @@ -13,7 +13,7 @@ each trait, its dataset, and several columns determined by its trait type (pheno from __future__ import absolute_import, division, print_function -# We do this here so we can use zach_settings + # We do this here so we can use zach_settings # Not to avoid other absoulte_imports import sys sys.path.append("../../..") @@ -506,4 +506,4 @@ def main(): ProbeSetXRef.run() if __name__ == "__main__": - main()
\ No newline at end of file + main() |