merge conflicts

stephanie · stephanie · commit 0aec98ecaf71 · 2017-01-25T14:40:01.000-07:00
diff --git a/odmtools/odmdata/memory_database.py b/odmtools/odmdata/memory_database.py
@@ -83,6 +83,7 @@ def get_annotations(self, query_db_again=False):
             annotation = self.series_service.get_annotations_by_result(resultid=result_id)
             self.results_annotations = annotation
 
+        return self.results_annotations
 
 
     def getDataValues(self):
