fix

Kyle Liu · Kyle Liu · commit 1ecd84e0b5bd · 2020-10-08T15:17:07.000+08:00
diff --git a/SUMMARY.md b/SUMMARY.md
@@ -3,11 +3,7 @@
 * [Introduction](README.md)
 * [介绍](readme-doc.md)
 
-<<<<<<< HEAD
 ## 剑指 Offer
-=======
-## 剑指 Offer <a id="lcof"></a>
->>>>>>> 792b82e420332e0a6146200d15f9d42b5c5fac4b
 
 * [OF3.数组中重复的数字](lcof/of003.md)
 * [OF37.序列化二叉树](lcof/of037.md)
