reslove conflict

awslabs · Sep 27, 2023 · 90d375b · 90d375b
1 parent bb322c0
commit 90d375b
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/source/constructs/api/data_source/service.py b/source/constructs/api/data_source/service.py
@@ -3,13 +3,7 @@
 import os
 import traceback
 from time import sleep
-<<<<<<< HEAD
-
-=======
-# import psycopg2
-# import cx_Oracle
 
->>>>>>> 084a5db0172f30110de58ba4b959f021566329a1
 import boto3
 
 import common.enum