Java: resolve merge conflict

Jami Cogswell · Jami Cogswell · commit 0071e1acc211 · 2025-01-30T10:19:21.000-05:00
remove import no longer needed since contents of MyBatisMapperXML.qll have been moved to MyBatis.qll
diff --git a/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisMapperXmlSqlInjection.ql b/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisMapperXmlSqlInjection.ql
@@ -15,7 +15,6 @@
 import java
 deprecated import MyBatisCommonLib
 deprecated import MyBatisMapperXmlSqlInjectionLib
-deprecated import semmle.code.xml.MyBatisMapperXML
 import semmle.code.java.dataflow.FlowSources
 private import semmle.code.java.security.Sanitizers
 deprecated import MyBatisMapperXmlSqlInjectionFlow::PathGraph
