Conflict

1 files changed, 4 insertions, 4 deletions

diff --git a/wqflask/maintenance/get_group_samplelists.py b/wqflask/maintenance/get_group_samplelists.py
index a9059fad..2d48ce78 100755
--- a/wqflask/maintenance/get_group_samplelists.py
+++ b/wqflask/maintenance/get_group_samplelists.py
@@ -28,7 +28,7 @@ def get_samplelist_from_geno(genofilename):
         genofile = gzip.open(genofilename)
     else:
         genofile = open(genofilename)
-        
+
     for line in genofile:
         line = line.strip()
         if not line:
@@ -36,9 +36,9 @@ def get_samplelist_from_geno(genofilename):
         if line.startswith(("#", "@")):
             continue
         break
-    
+
     headers = line.split()
-    
+
     if headers[3] == "Mb":
         samplelist = headers[4:]
     else:
@@ -47,7 +47,7 @@ def get_samplelist_from_geno(genofilename):
 
 def get_samplelist_from_plink(genofilename):
     genofile = open(genofilename)
-    
+
     samplelist = []
     for line in genofile:
         line = line.split(" ")