From 1d8b7de6d633c8be1b3f6bc796499fac7efeab58 Mon Sep 17 00:00:00 2001
From: zsloan
Date: Wed, 18 Mar 2015 19:11:20 +0000
Subject: .cross files should not be in the repository

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 9a509baa..d05b5dd7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 *.bak
 *~
 web/new_genotypes/HSNIH.json
+*.cross
-- 
cgit v1.2.3


From 9e089a7f14f912114cc2f59da3fe318220c39f24 Mon Sep 17 00:00:00 2001
From: DannyArends
Date: Thu, 19 Mar 2015 22:54:08 +0100
Subject: Test/Debug

---
 .gitignore                                             | 1 +
 wqflask/wqflask/marker_regression/marker_regression.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index d05b5dd7..1111cbc7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 *~
 web/new_genotypes/HSNIH.json
 *.cross
+*webqtlConfig.py
diff --git a/wqflask/wqflask/marker_regression/marker_regression.py b/wqflask/wqflask/marker_regression/marker_regression.py
index 2fe501d0..51e8e281 100755
--- a/wqflask/wqflask/marker_regression/marker_regression.py
+++ b/wqflask/wqflask/marker_regression/marker_regression.py
@@ -82,7 +82,7 @@ class MarkerRegression(object):
             else:
                 self.num_perm = start_vars['num_perm']
             self.control = start_vars['control_marker']
-
+            print("StartVars:", start_vars)
             self.method = start_vars['method']
             self.model = start_vars['model']
 
-- 
cgit v1.2.3