去冲突

This commit is contained in:
2026-01-09 14:43:12 +08:00
parent 6d1107abf1
commit b847121603
-5
View File
@@ -602,11 +602,6 @@
<!-- <artifactId>mysql-connector-java</artifactId>-->
<!-- <version>8.0.33</version>-->
<!-- </dependency>-->
<<<<<<< HEAD
=======
>>>>>>> 0f09380b841eb4db196b8a3ad66beb5d3d06e7f9
</dependencies>
</project>