reorg

lifemapper · Nov 18, 2021 · 30e51cb · 30e51cb
1 parent 4ec4cc2
commit 30e51cb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/lmtrex/flask_app/broker/base.py b/lmtrex/flask_app/broker/base.py
@@ -2,7 +2,12 @@
 from werkzeug.exceptions import HTTPException
 
 import lmtrex.tools.s2n.utils as lmutil
+<<<<<<< HEAD
 from lmtrex.common.lmconstants import (APIService, BrokerParameters, ServiceProvider)
+=======
+from lmtrex.common.lmconstants import (APIService, BrokerParameters,
+                                       ServiceProvider, )
+>>>>>>> reorg
 from lmtrex.common.s2n_type import S2nEndpoint, S2nKey, S2nOutput
 from lmtrex.tools.provider.gbif import GbifAPI
 from lmtrex.tools.provider.itis import ItisAPI

diff --git a/lmtrex/flask_app/broker/occ.py b/lmtrex/flask_app/broker/occ.py
@@ -249,12 +249,16 @@ def get_occurrence_records(cls, occid=None, provider=None, dataset_key=None, cou
 from lmtrex.tools.provider.mopho import MorphoSourceAPI
 from lmtrex.tools.provider.specify import SpecifyPortalAPI
 <<<<<<< HEAD
+<<<<<<< HEAD
 from lmtrex.tools.s2n.utils import get_traceback
 
 from lmtrex.services.api.v1.base import _S2nService
 from lmtrex.flask_app.broker.resolve import ResolveSvc
 =======
 from lmtrex.tools.utils import get_traceback
+=======
+from lmtrex.tools.s2n.utils import get_traceback
+>>>>>>> reorg
 
 from lmtrex.services.api.v1.base import _S2nService
 <<<<<<< HEAD