补充资料2

src/SUMMARY.md

@@ -7,7 +7,6 @@
       * [什么是佛](./chapter_2/a-02-01-gui-yi-fo.md)
       * [什么是法](./chapter_2/a-02-02-gui-yi-fa.md)
       * [什么是僧](./chapter_2/a-02-03-gui-yi-seng.md)
-<<<<<<< HEAD
     * [行皈依](./chapter_2/a-02-04-gui-yi.md)
     * [皈依者](./chapter_2/a-02-05-gui-yi.md)
     * [皈依方式](./chapter_2/a-02-06-gui-yi.md)
@@ -15,14 +14,6 @@
     * [皈依的破](./chapter_2/a-02-08-gui-yi.md)
     * [皈依的杂染](./chapter_2/a-02-09-gui-yi.md)
     * [皈依的果](./chapter_2/a-02-10-gui-yi.md)
-    * [行皈依](./chapter_2/a-02-04-gui-yi.md)
-    * [皈依者](./chapter_2/a-02-05-gui-yi-seng.md)
-    * [皈依方式](./chapter_2/a-03-gui-yi.md)
-    * [世间皈依和出世间皈依](./chapter_2/a-04-gui-yi.md)
-    * [皈依的破]
-    * [皈依的杂染]
-    * [皈依的果]
->>>>>>> 98e3e44ce897f259b5d3e55c9bd46f28f97e216b
   * [持戒](./chapter_2/b-chi-jie.md)
     * [学处组合](./chapter_2/b-01-chi-jie.md)
       * [梵行五戒](./chapter_2/b-01-1-chi-jie.md)