修复文档

package-lock.json

@@ -5,16 +5,12 @@
   "packages": {
     "": {
       "dependencies": {
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 30de1a500e0d372ac5ce5ef2bb9f1b480a50b7c3
+
         "json-server": "^1.0.0-beta.3",
         "marked": "^2.0.1",
         "pinia": "^3.0.3",
-        "pinia-plugin-persistedstate": "^4.5.0"
-<<<<<<< HEAD
-=======
+        "pinia-plugin-persistedstate": "^4.5.0",
+
         "markdown-it": "^14.1.0",
         "marked": "^2.0.1"
       },
@@ -66,9 +62,7 @@
       },
       "funding": {
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
->>>>>>> 253e01c5cbad72187fa9d8cae4a968927dd7d45a
-=======
->>>>>>> 30de1a500e0d372ac5ce5ef2bb9f1b480a50b7c3
+
       }
     },
     "node_modules/@babel/helper-string-parser": {
@@ -581,10 +575,7 @@
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 30de1a500e0d372ac5ce5ef2bb9f1b480a50b7c3
+
     "node_modules/es-escape-html": {
       "version": "0.1.1",
       "resolved": "https://registry.npmmirror.com/es-escape-html/-/es-escape-html-0.1.1.tgz",
@@ -659,9 +650,9 @@
       "version": "1.0.0-beta.3",
       "resolved": "https://registry.npmmirror.com/json-server/-/json-server-1.0.0-beta.3.tgz",
       "integrity": "sha512-DwE69Ep5ccwIJZBUIWEENC30Yj8bwr4Ax9W9VoIWAYnB8Sj4ReptscO8/DRHv/nXwVlmb3Bk73Ls86+VZdYkkA==",
-<<<<<<< HEAD
+
       "license": "SEE LICENSE IN ./LICENSE",
-=======
+
     "node_modules/errorhandler": {
       "version": "1.5.1",
       "resolved": "https://registry.npmmirror.com/errorhandler/-/errorhandler-1.5.1.tgz",
@@ -1091,9 +1082,6 @@
       "version": "14.1.0",
       "resolved": "https://registry.npmmirror.com/markdown-it/-/markdown-it-14.1.0.tgz",
       "integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==",
->>>>>>> 253e01c5cbad72187fa9d8cae4a968927dd7d45a
-=======
->>>>>>> 30de1a500e0d372ac5ce5ef2bb9f1b480a50b7c3
       "dependencies": {
         "@tinyhttp/app": "^2.4.0",
         "@tinyhttp/cors": "^2.0.1",
@@ -1161,10 +1149,7 @@
         "node": ">= 8.16.2"
       }
     },
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 30de1a500e0d372ac5ce5ef2bb9f1b480a50b7c3
+
     "node_modules/milliparsec": {
       "version": "4.0.0",
       "resolved": "https://registry.npmmirror.com/milliparsec/-/milliparsec-4.0.0.tgz",
@@ -1200,8 +1185,8 @@
         "node": ">=10"
       }
     },
-<<<<<<< HEAD
-=======
+
+
     "node_modules/math-intrinsics": {
       "version": "1.1.0",
       "resolved": "https://registry.npmmirror.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
@@ -1343,35 +1328,26 @@
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
->>>>>>> 253e01c5cbad72187fa9d8cae4a968927dd7d45a
-=======
->>>>>>> 30de1a500e0d372ac5ce5ef2bb9f1b480a50b7c3
+
     "node_modules/nanoid": {
       "version": "3.3.11",
       "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.11.tgz",
       "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
+
       "dev": true,
->>>>>>> 253e01c5cbad72187fa9d8cae4a968927dd7d45a
-=======
->>>>>>> 30de1a500e0d372ac5ce5ef2bb9f1b480a50b7c3
+
       "funding": [
         {
           "type": "github",
           "url": "https://github.com/sponsors/ai"
         }
       ],
-<<<<<<< HEAD
-<<<<<<< HEAD
+
       "license": "MIT",
       "peer": true,
-=======
->>>>>>> 253e01c5cbad72187fa9d8cae4a968927dd7d45a
-=======
+
       "peer": true,
->>>>>>> 30de1a500e0d372ac5ce5ef2bb9f1b480a50b7c3
+
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },
@@ -1383,22 +1359,16 @@
       "version": "0.6.4",
       "resolved": "https://registry.npmmirror.com/negotiator/-/negotiator-0.6.4.tgz",
       "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
-<<<<<<< HEAD
-<<<<<<< HEAD
+
       "license": "MIT",
-=======
+
       "dev": true,
->>>>>>> 253e01c5cbad72187fa9d8cae4a968927dd7d45a
-=======
->>>>>>> 30de1a500e0d372ac5ce5ef2bb9f1b480a50b7c3
+
       "engines": {
         "node": ">= 0.6"
       }
     },
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 30de1a500e0d372ac5ce5ef2bb9f1b480a50b7c3
+
     "node_modules/perfect-debounce": {
       "version": "1.0.0",
       "resolved": "https://registry.npmmirror.com/perfect-debounce/-/perfect-debounce-1.0.0.tgz",
@@ -1541,24 +1511,18 @@
       "resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.2.1.tgz",
       "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
       "peer": true,
-<<<<<<< HEAD
-=======
+
     "node_modules/object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmmirror.com/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
       "dev": true,
->>>>>>> 253e01c5cbad72187fa9d8cae4a968927dd7d45a
-=======
->>>>>>> 30de1a500e0d372ac5ce5ef2bb9f1b480a50b7c3
+
       "engines": {
         "node": ">=0.10.0"
       }
     },
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 30de1a500e0d372ac5ce5ef2bb9f1b480a50b7c3
+
     "node_modules/speakingurl": {
       "version": "14.0.1",
       "resolved": "https://registry.npmmirror.com/speakingurl/-/speakingurl-14.0.1.tgz",
@@ -1593,9 +1557,9 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmmirror.com/totalist/-/totalist-3.0.1.tgz",
       "integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==",
-<<<<<<< HEAD
+
       "license": "MIT",
-=======
+
     "node_modules/object-inspect": {
       "version": "1.13.4",
       "resolved": "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.13.4.tgz",
@@ -1688,17 +1652,12 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmmirror.com/punycode.js/-/punycode.js-2.3.1.tgz",
       "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==",
->>>>>>> 253e01c5cbad72187fa9d8cae4a968927dd7d45a
-=======
->>>>>>> 30de1a500e0d372ac5ce5ef2bb9f1b480a50b7c3
+
       "engines": {
         "node": ">=6"
       }
     },
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 30de1a500e0d372ac5ce5ef2bb9f1b480a50b7c3
+
     "node_modules/type-fest": {
       "version": "4.41.0",
       "resolved": "https://registry.npmmirror.com/type-fest/-/type-fest-4.41.0.tgz",
@@ -1728,9 +1687,8 @@
       "peerDependenciesMeta": {
         "typescript": {
           "optional": true
-        }
-<<<<<<< HEAD
-=======
+        },
+
     "node_modules/qs": {
       "version": "6.13.0",
       "resolved": "https://registry.npmmirror.com/qs/-/qs-6.13.0.tgz",
@@ -2110,9 +2068,11 @@
       "dev": true,
       "engines": {
         "node": ">=12"
->>>>>>> 253e01c5cbad72187fa9d8cae4a968927dd7d45a
-=======
->>>>>>> 30de1a500e0d372ac5ce5ef2bb9f1b480a50b7c3
+      }
+    }
+  }
+  }
+}
     }
   }
 }