'整合'

2025-04-23 16:33:28 +08:00
parent d1f8531723
commit 13e3bcad69
2 changed files with 1 additions and 5 deletions
--- a/src/data/index.js
+++ b/src/data/index.js
@@ -92,13 +92,9 @@ export const data = [
        result: 0,
      },
    ],
-<<<<<<< HEAD
    tips: [
      `全国最早实行对外开放的`,
      `四个经济特区之一`
    ],
-=======
-    tips: [`全国最早实行对外开放的四个经济特区之一`],
->>>>>>> 5d8a8f95c11f0c188f14ac80980c820e348aa1c2
  },
 ];