resolve: conflicts

11 months ago · ea567c80bf
parent 96cfa91350
commit ea567c80bf
1 changed files with 1 additions and 0 deletions
--- a/api/core/ops/ops_trace_manager.py
+++ b/api/core/ops/ops_trace_manager.py
@ -14,6 +14,7 @@ from sqlalchemy import select
 from sqlalchemy.orm import Session
 from core.helper.encrypter import decrypt_token, encrypt_token, obfuscated_token
 from core.ops.arize_phoenix_trace.arize_phoenix_trace import ArizePhoenixDataTrace
 from core.ops.entities.config_entity import (
    OPS_FILE_PATH,
    TracingProviderEnum,