Resolve confilct

2025-12-24 04:36:35 +01:00 · 2022-10-13 12:43:47 +02:00
parent 646c9b559b
commit 5f737c82a4
1 changed files with 0 additions and 4 deletions
--- a/python/ql/lib/semmle/python/frameworks/Pyodbc.qll
+++ b/python/ql/lib/semmle/python/frameworks/Pyodbc.qll
@@ -3,11 +3,7 @@
 *
 * See
 * - https://github.com/mkleehammer/pyodbc/wiki
-<<<<<<< HEAD
- * - https://pypi.org/project/pyodbc/ 
-=======
 * - https://pypi.org/project/pyodbc/
->>>>>>> 5352eb77cc (Add python cx_oracle, phoenixdb, pyodbc models)
 */

 private import python