Update index.md

5012b962 · terrymanu · aeeed43c · 5012b962
隐藏空白更改
内联并排

Showing with 0 addition and 4 deletion

sharding-jdbc-doc/content/index/index.md sharding-jdbc-doc/content/index/index.md +0 -4

未找到文件。
--- a/sharding-jdbc-doc/content/index/index.md
+++ b/sharding-jdbc-doc/content/index/index.md
@@ -46,11 +46,7 @@ index = true

 # 整体架构图

-<<<<<<< HEAD
 ![整体架构图1](img/architecture.png)
-=======
-![整体架构图1](../img/architecture.png)
->>>>>>> d2aa9f588f5ed3f3bb4b93f956bb07d35ba29e70

 # Quick Start