fix merge issues

Author: sreeder

odm2api/ODM2/services/readService.py

@@ -527,13 +527,9 @@ def getUnits(self, ids=None, name=None, type=None):
         try:
             return q.all()
         except Exception as e:
-<<<<<<< Updated upstream
             print('Error running Query: {}'.format(e))
             return None
-=======
-            print("Error running Query: %s" % e)
-            return []
->>>>>>> Stashed changes
+
 
     # Organization
     def getOrganizations(self, ids=None, codes=None):