aboutsummaryrefslogtreecommitdiff
path: root/wqflask/base/data_set.py
diff options
context:
space:
mode:
authorzsloan2015-05-12 16:50:18 +0000
committerzsloan2015-05-12 16:50:18 +0000
commita544231453be26339d9b1c45888f1e7fffa1ca2e (patch)
tree1eeb20db35015c43cae291b8150bf6712fb8a90a /wqflask/base/data_set.py
parent12b4663b495fed487d52c76656b64ca08273e9a9 (diff)
parent35a81d6a96df1d2fbb315d65af4f7f864b1e5b76 (diff)
downloadgenenetwork2-a544231453be26339d9b1c45888f1e7fffa1ca2e.tar.gz
Resolved conflict before commit
Diffstat (limited to 'wqflask/base/data_set.py')
-rwxr-xr-xwqflask/base/data_set.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index 489bd374..1cd57b4b 100755
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -42,7 +42,7 @@ from base import species
from dbFunction import webqtlDatabaseFunction
from utility import webqtlUtil
from utility.benchmark import Bench
-from wqflask.my_pylmm.pyLMM import chunks
+from utility import chunks
from maintenance import get_group_samplelists