diff options
Diffstat (limited to 'wqflask')
| -rw-r--r-- | wqflask/wqflask/marker_regression/gemma_mapping.py | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | wqflask/wqflask/templates/show_trait_mapping_tools.html | 0 |
2 files changed, 4 insertions, 0 deletions
diff --git a/wqflask/wqflask/marker_regression/gemma_mapping.py b/wqflask/wqflask/marker_regression/gemma_mapping.py index 7563eb2c..4713f8d6 100644 --- a/wqflask/wqflask/marker_regression/gemma_mapping.py +++ b/wqflask/wqflask/marker_regression/gemma_mapping.py @@ -3,7 +3,11 @@ import os, math, string, random, json from base import webqtlConfig from base.trait import GeneralTrait from base.data_set import create_dataset +<<<<<<< HEAD +from utility.tools import assert_file, flat_files, GEMMA_COMMAND, GEMMA_WRAPPER_COMMAND, TEMPDIR +======= from utility.tools import flat_files, GEMMA_COMMAND, GEMMA_WRAPPER_COMMAND, TEMPDIR +>>>>>>> 270f86c41f7c90cc4ca51bca0aec789a09a36a0e import utility.logger logger = utility.logger.getLogger(__name__ ) diff --git a/wqflask/wqflask/templates/show_trait_mapping_tools.html b/wqflask/wqflask/templates/show_trait_mapping_tools.html index 03590c2c..03590c2c 100644..100755 --- a/wqflask/wqflask/templates/show_trait_mapping_tools.html +++ b/wqflask/wqflask/templates/show_trait_mapping_tools.html |