Resolve conflicts

1 files changed, 1 insertions, 7 deletions

diff --git a/wqflask/base/trait.py b/wqflask/base/trait.py
index afde3dbe..9566c192 100644
--- a/wqflask/base/trait.py
+++ b/wqflask/base/trait.py
@@ -82,13 +82,7 @@ class GeneralTrait(object):
                     dataset=self.dataset.name,
                     description=self.description_display,
                     mean=self.mean)
-
-
-    def get_info(self):
-        """For lots of traits just use get_trait_info in dataset instead...that will be way
-        more efficient"""
-        self.dataset.get_trait_info([self],
-            webqtlDatabaseFunction.retrieve_species(self.dataset.group.name))
+                    
 
     def get_name(self):
         stringy = ""