From 18304a9b20bd4180b40be8296df26c2a0acf62fa Mon Sep 17 00:00:00 2001
From: Alexanderlacuna
Date: Thu, 29 Oct 2020 16:07:52 +0300
Subject: resolve merge conflict

---
 wqflask/wqflask/show_trait/export_trait_data.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wqflask/wqflask/show_trait/export_trait_data.py b/wqflask/wqflask/show_trait/export_trait_data.py
index 374184eb..48feb492 100644
--- a/wqflask/wqflask/show_trait/export_trait_data.py
+++ b/wqflask/wqflask/show_trait/export_trait_data.py
@@ -17,7 +17,7 @@ def export_sample_table(targs):
     for sample_group in ['primary_samples', 'other_samples']:
         for row in sample_data[sample_group]:
             sorted_row = dict_to_sorted_list(row)
-            #print("sorted_row is:", pf(sorted_row))
+            print("sorted_row is:", pf(sorted_row))
             final_sample_data.append(sorted_row)
 
     return trait_name, final_sample_data
-- 
cgit v1.2.3