diff options
| author | zsloan | 2018-04-13 15:55:56 +0000 |
|---|---|---|
| committer | zsloan | 2018-04-13 15:55:56 +0000 |
| commit | 0bead53661ea701ffd9f9d565e4d2ecbbed81a8e (patch) | |
| tree | 9e2c1654cf1344603028d4bda7c27ff1c167f424 | |
| parent | eb24f53d7f5210ead3748772bb4126f78520f32c (diff) | |
| download | genenetwork2-0bead53661ea701ffd9f9d565e4d2ecbbed81a8e.tar.gz | |
Last commit didn't conflict for some reason, hopefully this one should
| -rw-r--r-- | wqflask/wqflask/marker_regression/gemma_mapping.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/wqflask/wqflask/marker_regression/gemma_mapping.py b/wqflask/wqflask/marker_regression/gemma_mapping.py index 4713f8d6..f28cc63e 100644 --- a/wqflask/wqflask/marker_regression/gemma_mapping.py +++ b/wqflask/wqflask/marker_regression/gemma_mapping.py @@ -3,11 +3,8 @@ 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__ ) @@ -251,4 +248,4 @@ def parse_loco_output(this_dataset, gwa_output_filename): included_markers.append(line.split("\t")[1]) p_values.append(float(line.split("\t")[11])) - return marker_obs
\ No newline at end of file + return marker_obs |