Resolve confilct

sylwia-budzynska · sylwia-budzynska · commit 5f737c82a404 · 2022-10-13T12:43:47.000+02:00
diff --git 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
