Skip to content

Commit 07245ae

Browse files
committed
[FIX] Fixed conflicts
1 parent 090de69 commit 07245ae

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

requirements.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
# generated from manifests external_dependencies
2-
<<<<<<< HEAD
32
mysqlclient
4-
=======
53
pymssql
64
pyodbc
7-
>>>>>>> 43408ef8 ([ADD] base_external_dbsource_mssql: Support for ODBC)
85
sqlalchemy

0 commit comments

Comments
 (0)