merge fixup

ispyb · Nov 3, 2022 · 8b2d3c8 · 8b2d3c8
1 parent c083782
commit 8b2d3c8
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/pyispyb/core/routes/user.py b/pyispyb/core/routes/user.py
@@ -2,13 +2,9 @@
 
 from pydantic import BaseModel, Field
 
-<<<<<<< HEAD
 from ...app.extensions.database.definitions import get_current_person, get_options
-=======
 from ...app.extensions.auth.onetime import generate_onetime_token
 from ...app.extensions.options.schema import BeamLineGroup
-from ...app.extensions.database.definitions import get_current_person
->>>>>>> 6c10961... add onetime tokens
 from ...app.base import AuthenticatedAPIRouter
 from ...app.globals import g