resolve: conflicts

11 months ago · a0c5488979
parent ea567c80bf
commit a0c5488979
1 changed files with 0 additions and 1 deletions
--- a/api/core/ops/ops_trace_manager.py
+++ b/api/core/ops/ops_trace_manager.py
@ -14,7 +14,6 @@ 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,