xf

2024-05-30 20:58:26 +08:00 · 2024-05-30 20:58:26 +08:00 · 1ffa1b2c48
parent 5cb75b340b 9c311dc42a
commit 1ffa1b2c48
14 changed files with 1295 additions and 0 deletions
--- a/.devops/2.yml
+++ b/.devops/2.yml
@ -0,0 +1,55 @@
+version: 2
+name: "2"
+description: ""
+global:
+  concurrent: 1
+workflow:
+  - ref: start
+    name: 开始
+    task: start
+  - ref: end
+    name: 结束
+    task: end
+    needs:
+      - ssh_cmd_0
+  - ref: ssh_cmd_0
+    name: ssh执行命令
+    task: ssh_cmd@1.1.1
+    input:
+      ssh_pass: ((ssh.passward))
+      ssh_ip: '"47.97.180.226"'
+      ssh_port: '"22"'
+      ssh_user: '"root"'
+      ssh_cmd: '"docker stop ghc_group7 && docker rm ghc_group7 && docker pull
+        registry.cn-guangzhou.aliyuncs.com/nudt_devops/gitlink_help_center_group7:latest
+        && docker run -d -p 3000:3000 --name ghc_group7
+        registry.cn-guangzhou.aliyuncs.com/nudt_devops/gitlink_help_center_group7:latest"'
+    needs:
+      - docker_image_build_0
+  - ref: docker_image_build_0
+    name: docker镜像构建
+    task: docker_image_build@1.6.0
+    input:
+      docker_username: ((Docker.name))
+      docker_password: ((Docker.passward))
+      image_name: '"registry.cn-guangzhou.aliyuncs.com/nudt_devops/gitlink_help_center_group7"'
+      image_tag: '"latest"'
+      registry_address: '"registry.cn-guangzhou.aliyuncs.com"'
+      docker_file: '"Dockerfile"'
+      docker_build_path: '"."'
+      workspace: git_clone_0.git_path
+      image_push: true
+      build_args: '""'
+    needs:
+      - git_clone_0
+  - ref: git_clone_0
+    name: git clone
+    task: git_clone@1.2.9
+    input:
+      remote_url: '"https://gitlink.org.cn/wangmingqiang/gitlink_help_center.git"'
+      ref: '"refs/heads/master"'
+      commit_id: '""'
+      depth: 1
+    needs:
+      - start
+
--- a/.devops/test.yml
+++ b/.devops/test.yml
@ -3,6 +3,14 @@ name: test
 description: ""
 global:
  concurrent: 1
+<<<<<<< HEAD
+=======
+trigger:
+  webhook: gitlink@1.0.0
+  event:
+    - ref: push
+      ruleset-operator: AND
+>>>>>>> origin/master
 workflow:
  - ref: start
    name: 开始
@ -16,6 +24,7 @@ workflow:
    name: docker镜像构建
    task: docker_image_build@1.6.0
    input:
+<<<<<<< HEAD
      docker_username: ((docker.username))
      docker_password: ((docker.passward))
      image_name: '"registry.cn-guangzhou.aliyuncs.com/nudt_devops/gitlink_help_center"'
@ -24,6 +33,14 @@ workflow:
      docker_file: '"Dockerfile"'
      docker_build_path: '"."'
      workspace: git_clone_0.git_path
+=======
+      image_name: '""'
+      image_tag: '"latest"'
+      registry_address: '""'
+      docker_file: '"Dockerfile"'
+      docker_build_path: '"."'
+      workspace: '"."'
+>>>>>>> origin/master
      image_push: true
      build_args: '""'
    needs:
@ -32,7 +49,11 @@ workflow:
    name: git clone
    task: git_clone@1.2.9
    input:
+<<<<<<< HEAD
      remote_url: '"https://gitlink.org.cn/wangmingqiang/gitlink_help_center.git"'
+=======
+      remote_url: '""'
+>>>>>>> origin/master
      ref: '"refs/heads/master"'
      commit_id: '""'
      depth: 1
@ -42,11 +63,18 @@ workflow:
    name: ssh执行命令
    task: ssh_cmd@1.1.1
    input:
+<<<<<<< HEAD
      ssh_pass: ((ssh.passward))
      ssh_ip: '"47.97.180.226"'
      ssh_port: '"3000"'
      ssh_user: '"root"'
      ssh_cmd: "'ls'"
+=======
+      ssh_ip: '""'
+      ssh_port: '"22"'
+      ssh_user: '"root"'
+      ssh_cmd: '""'
+>>>>>>> origin/master
    needs:
      - docker_image_build_0

--- a/.devops/work.yml
+++ b/.devops/work.yml
@ -0,0 +1,29 @@
+version: 2
+name: work
+description: ""
+global:
+  concurrent: 1
+workflow:
+  - ref: end
+    name: 结束
+    task: end
+    needs:
+      - ssh_cmd_0
+  - ref: ssh_cmd_0
+    name: ssh执行命令
+    task: ssh_cmd@1.1.1
+    input:
+      ssh_pass: ((ssh.passward))
+      ssh_ip: '"47.97.180.226"'
+      ssh_port: '"22"'
+      ssh_user: '"root"'
+      ssh_cmd: '"docker stop ghc_group7 && docker rm ghc_group7 && docker pull
+        registry.cn-guangzhou.aliyuncs.com/nudt_devops/gitlink_help_center_group7:latest
+        && docker run -d -p 3000:3000 --name ghc_group7
+        registry.cn-guangzhou.aliyuncs.com/nudt_devops/gitlink_help_center_group7:latest"'
+    needs:
+      - start
+  - ref: start
+    name: 开始
+    task: start
+
--- a/.devops/未命名项目.yml
+++ b/.devops/未命名项目.yml
@ -0,0 +1,34 @@
+version: 2
+name: 未命名项目
+description: ""
+global:
+  concurrent: 1
+trigger:
+  webhook: gitlink@1.0.0
+  event:
+    - ref: push
+      ruleset-operator: AND
+workflow:
+  - ref: start
+    name: 开始
+    task: start
+  - ref: end
+    name: 结束
+    task: end
+    needs:
+      - docker_image_build_0
+  - ref: docker_image_build_0
+    name: docker镜像构建
+    task: docker_image_build@1.6.0
+    input:
+      image_name: '""'
+      image_tag: '"latest"'
+      registry_address: '""'
+      docker_file: '"Dockerfile"'
+      docker_build_path: '"."'
+      workspace: '"."'
+      image_push: true
+      build_args: '""'
+    needs:
+      - start
+
--- a/4
+++ b/4
@ -1,9 +1,13 @@
 FROM node:18-alpine
 <<<<<<< HEAD
+<<<<<<< HEAD
 LABEL maintainer="hejiayu <hejy47@nudt.edu.cn>"
 =======
 LABEL maintainer="wangmingqiang <wangmingqiang21@nudt.edu.cn>"
 >>>>>>> 7de679ce30cca0042df81a002d7d36f9d90f49a5
+=======
+LABEL maintainer="wangmingqiang <wangmingqiang21@nudt.edu.cn>"
+>>>>>>> origin/master

 WORKDIR /gitlink_help_center

--- a/docs/联系我们/联系.md
+++ b/docs/联系我们/联系.md
@ -10,6 +10,7 @@ sidebar_position: 1

 2.开发维护人员电话

+<<<<<<< HEAD
 王顺康：110

 肖帆：18879439530
@ -17,3 +18,12 @@ sidebar_position: 1
 刘屹涛：119

 王明强：12011
+=======
+王顺康：15675190127
+
+肖帆：18879439530
+
+刘屹涛：1110
+
+王明强：1230123
+>>>>>>> origin/master
--- a/docs/问题反馈/常见问题.md
+++ b/docs/问题反馈/常见问题.md
@ -1,5 +1,6 @@
 ---
 sidebar_label: '常见问题'      
+<<<<<<< HEAD
 sidebar_position: 1    
 ---

@ -26,3 +27,27 @@ import MyForm from '../../src/pages/MyForm';
 ## 提出你的问题

 <MyForm />
+=======
+sidebar_position: 1     
+---
+
+# 常见问题
+
+## 常见问题罗列
+1.问：冲突（Conflicts）：当合并分支或拉取远程更改时，可能会出现冲突怎么办？
+
+答：解决冲突的方法包括手动编辑文件以解决冲突、使用图形化工具进行解决、或者取消合并并重新尝试。
+
+2.问：提交错误（Committing Mistakes）：可能会不小心提交了错误的文件或信息。
+
+答：可以使用 git commit --amend 命令来修改最近一次提交，或者使用交互式 rebase 来修改历史记录。
+
+3.问：丢失提交（Lost Commits）：有时可能会意外丢失提交记录。
+答：可以使用 git reflog 命令来查找丢失的提交，然后将其恢复。
+
+4：分支管理问题（Branch Management Issues）：可能会遇到创建、合并、删除分支时的问题。
+
+答：确保在操作分支之前了解清楚分支的当前状态，并使用正确的命令来执行相应的操作。
+
+......
+>>>>>>> origin/master
--- a/docusaurus.config.js
+++ b/docusaurus.config.js
@ -170,8 +170,14 @@ module.exports = {
  ],
  i18n: {
    defaultLocale: 'zh-cn',
+<<<<<<< HEAD
    locales: ['zh-cn','en'],
  },
 };


+=======
+    locales: ['zh-cn'],
+  },
+};
+>>>>>>> origin/master
--- a/1
+++ b/1
@ -0,0 +1 @@
+Subproject commit 9768ca9d069b956afe60a6631fc291d12d20faa1
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -19,8 +19,11 @@
    "@docusaurus/plugin-client-redirects": "2.4.1",
    "@docusaurus/preset-classic": "2.4.1",
    "@easyops-cn/docusaurus-search-local": "^0.35.0",
+<<<<<<< HEAD
    "@mdx-js/loader": "^3.0.1",
    "@mdx-js/mdx": "^3.0.1",
+=======
+>>>>>>> origin/master
    "@mdx-js/react": "1.6.22",
    "@node-rs/jieba": "^1.7.0",
    "clsx": "1.2.1",
--- a/sidebars.js
+++ b/sidebars.js
@ -6,6 +6,7 @@ module.exports = {
      label: 'Docs',
    }
  ],
+<<<<<<< HEAD
  module: {
    rules: [
      {
@ -14,4 +15,6 @@ module.exports = {
      }
    ]
  }
+=======
+>>>>>>> origin/master
 };
--- a/src/theme/BlogListPage/index.js
+++ b/src/theme/BlogListPage/index.js
@ -1,7 +1,10 @@
 import React from 'react';
 import { ThemeClassNames } from '@docusaurus/theme-common';
 import Layout from '@theme/Layout';
+<<<<<<< HEAD
 import LanguageSwitcher from './LanguageSwitcher';
+=======
+>>>>>>> origin/master

 import styles from './styles.module.css';
 import ListItem from './ListItem';
@ -27,7 +30,10 @@ export default function BlogListPage(props) {
          {posts.map(({ content }) => (
            <ListItem key={content.metadata.permalink} content={content} />
          ))}
+<<<<<<< HEAD
          <LanguageSwitcher />
+=======
+>>>>>>> origin/master
        </div>
      </main>
    </Layout>
--- a/yarn.lock
+++ b/yarn.lock
@ -1774,6 +1774,7 @@
  resolved "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz"
  integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==

+<<<<<<< HEAD
 "@mdx-js/loader@^3.0.1":
  version "3.0.1"
  resolved "https://registry.npmjs.org/@mdx-js/loader/-/loader-3.0.1.tgz"
@ -1782,6 +1783,8 @@
    "@mdx-js/mdx" "^3.0.0"
    source-map "^0.7.0"

+=======
+>>>>>>> origin/master
 "@mdx-js/mdx@^1.6.22":
  version "1.6.22"
  resolved "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-1.6.22.tgz"
@ -1807,6 +1810,7 @@
    unist-builder "2.0.3"
    unist-util-visit "2.0.3"

+<<<<<<< HEAD
 "@mdx-js/mdx@^3.0.0", "@mdx-js/mdx@^3.0.1":
  version "3.0.1"
  resolved "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-3.0.1.tgz"
@ -1836,6 +1840,8 @@
    unist-util-visit "^5.0.0"
    vfile "^6.0.0"

+=======
+>>>>>>> origin/master
 "@mdx-js/react@^1.6.22", "@mdx-js/react@1.6.22":
  version "1.6.22"
  resolved "https://registry.npmjs.org/@mdx-js/react/-/react-1.6.22.tgz"
@ -2050,6 +2056,7 @@
  resolved "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz"
  integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==

+<<<<<<< HEAD
 "@types/acorn@^4.0.0":
  version "4.0.6"
  resolved "https://registry.npmjs.org/@types/acorn/-/acorn-4.0.6.tgz"
@ -2057,6 +2064,8 @@
  dependencies:
    "@types/estree" "*"

+=======
+>>>>>>> origin/master
 "@types/body-parser@*":
  version "1.19.2"
  resolved "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz"
@ -2087,6 +2096,7 @@
  dependencies:
    "@types/node" "*"

+<<<<<<< HEAD
 "@types/debug@^4.0.0":
  version "4.1.12"
  resolved "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz"
@ -2094,6 +2104,8 @@
  dependencies:
    "@types/ms" "*"

+=======
+>>>>>>> origin/master
 "@types/eslint-scope@^3.7.3":
  version "3.7.4"
  resolved "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz"
@ -2110,6 +2122,7 @@
    "@types/estree" "*"
    "@types/json-schema" "*"

+<<<<<<< HEAD
 "@types/estree-jsx@^1.0.0":
  version "1.0.5"
  resolved "https://registry.npmjs.org/@types/estree-jsx/-/estree-jsx-1.0.5.tgz"
@ -2117,16 +2130,21 @@
  dependencies:
    "@types/estree" "*"

+=======
+>>>>>>> origin/master
 "@types/estree@*", "@types/estree@^0.0.51":
  version "0.0.51"
  resolved "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz"
  integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==

+<<<<<<< HEAD
 "@types/estree@^1.0.0":
  version "1.0.5"
  resolved "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz"
  integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==

+=======
+>>>>>>> origin/master
 "@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18":
  version "4.17.31"
  resolved "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz"
@ -2147,6 +2165,7 @@
    "@types/serve-static" "*"

 "@types/hast@^2.0.0":
+<<<<<<< HEAD
  version "2.3.10"
  resolved "https://registry.npmjs.org/@types/hast/-/hast-2.3.10.tgz"
  integrity sha512-McWspRw8xx8J9HurkVBfYj0xKoE25tOFlHGdx4MJ5xORQrMGZNqJhVQWaIbm6Oyla5kYOXtDiopzKRJzEOkwJw==
@ -2157,6 +2176,11 @@
  version "3.0.4"
  resolved "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz"
  integrity sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==
+=======
+  version "2.3.4"
+  resolved "https://registry.npmjs.org/@types/hast/-/hast-2.3.4.tgz"
+  integrity sha512-wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g==
+>>>>>>> origin/master
  dependencies:
    "@types/unist" "*"

@ -2202,6 +2226,7 @@
  integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==

 "@types/mdast@^3.0.0":
+<<<<<<< HEAD
  version "3.0.15"
  resolved "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.15.tgz"
  integrity sha512-LnwD+mUEfxWMa1QpDraczIn6k0Ee3SMicuYSSzS6ZYl2gKS09EClnJYGd8Du6rfc5r/GZEk5o1mRb8TaTj03sQ==
@ -2220,16 +2245,27 @@
  resolved "https://registry.npmjs.org/@types/mdx/-/mdx-2.0.13.tgz"
  integrity sha512-+OWZQfAYyio6YkJb3HLxDrvnx6SWWDbC0zVPfBRzUk0/nqoDyf6dNxQi3eArPe8rJ473nobTMQ/8Zk+LxJ+Yuw==

+=======
+  version "3.0.11"
+  resolved "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.11.tgz"
+  integrity sha512-Y/uImid8aAwrEA24/1tcRZwpxX3pIFTSilcNDKSPn+Y2iDywSEachzRuvgAYYLR3wpGXAsMbv5lvKLDZLeYPAw==
+  dependencies:
+    "@types/unist" "*"
+
+>>>>>>> origin/master
 "@types/mime@*":
  version "3.0.1"
  resolved "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz"
  integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==

+<<<<<<< HEAD
 "@types/ms@*":
  version "0.7.34"
  resolved "https://registry.npmjs.org/@types/ms/-/ms-0.7.34.tgz"
  integrity sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==

+=======
+>>>>>>> origin/master
 "@types/node@*":
  version "18.11.11"
  resolved "https://registry.npmjs.org/@types/node/-/node-18.11.11.tgz"
@ -2339,16 +2375,23 @@
  dependencies:
    "@types/node" "*"

+<<<<<<< HEAD
 "@types/unist@*", "@types/unist@^2", "@types/unist@^2.0.0", "@types/unist@^2.0.2", "@types/unist@^2.0.3":
+=======
+"@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2", "@types/unist@^2.0.3":
+>>>>>>> origin/master
  version "2.0.6"
  resolved "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz"
  integrity sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==

+<<<<<<< HEAD
 "@types/unist@^3.0.0":
  version "3.0.2"
  resolved "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz"
  integrity sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==

+=======
+>>>>>>> origin/master
 "@types/ws@^8.5.1":
  version "8.5.3"
  resolved "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz"
@ -2368,11 +2411,14 @@
  dependencies:
    "@types/yargs-parser" "*"

+<<<<<<< HEAD
 "@ungap/structured-clone@^1.0.0":
  version "1.2.0"
  resolved "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz"
  integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==

+=======
+>>>>>>> origin/master
 "@webassemblyjs/ast@1.11.1":
  version "1.11.1"
  resolved "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz"
@ -2517,17 +2563,24 @@ acorn-import-assertions@^1.7.6:
  resolved "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz"
  integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==

+<<<<<<< HEAD
 acorn-jsx@^5.0.0:
  version "5.3.2"
  resolved "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz"
  integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==

+=======
+>>>>>>> origin/master
 acorn-walk@^8.0.0:
  version "8.2.0"
  resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz"
  integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==

+<<<<<<< HEAD
 "acorn@^6.0.0 || ^7.0.0 || ^8.0.0", acorn@^8, acorn@^8.0.0, acorn@^8.0.4, acorn@^8.5.0, acorn@^8.7.1:
+=======
+acorn@^8, acorn@^8.0.4, acorn@^8.5.0, acorn@^8.7.1:
+>>>>>>> origin/master
  version "8.8.1"
  resolved "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz"
  integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==
@ -2707,11 +2760,14 @@ asap@~2.0.3:
  resolved "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz"
  integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==

+<<<<<<< HEAD
 astring@^1.8.0:
  version "1.8.6"
  resolved "https://registry.npmjs.org/astring/-/astring-1.8.6.tgz"
  integrity sha512-ISvCdHdlTDlH5IpxQJIex7BWBywFWgjJSVdwst+/iQCoEYnyOaQ95+X1JGshuBjGp6nxKUy1jMgE3zPqN7fQdg==

+=======
+>>>>>>> origin/master
 at-least-node@^1.0.0:
  version "1.0.0"
  resolved "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz"
@ -2797,11 +2853,14 @@ bail@^1.0.0:
  resolved "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz"
  integrity sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==

+<<<<<<< HEAD
 bail@^2.0.0:
  version "2.0.2"
  resolved "https://registry.npmjs.org/bail/-/bail-2.0.2.tgz"
  integrity sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==

+=======
+>>>>>>> origin/master
 balanced-match@^1.0.0:
  version "1.0.2"
  resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"
@ -2992,11 +3051,14 @@ ccount@^1.0.0:
  resolved "https://registry.npmjs.org/ccount/-/ccount-1.1.0.tgz"
  integrity sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==

+<<<<<<< HEAD
 ccount@^2.0.0:
  version "2.0.1"
  resolved "https://registry.npmjs.org/ccount/-/ccount-2.0.1.tgz"
  integrity sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==

+=======
+>>>>>>> origin/master
 chalk@^2.0.0:
  version "2.4.2"
  resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"
@ -3014,41 +3076,53 @@ chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2:
    ansi-styles "^4.1.0"
    supports-color "^7.1.0"

+<<<<<<< HEAD
 character-entities-html4@^2.0.0:
  version "2.1.0"
  resolved "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-2.1.0.tgz"
  integrity sha512-1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA==

+=======
+>>>>>>> origin/master
 character-entities-legacy@^1.0.0:
  version "1.1.4"
  resolved "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz"
  integrity sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==

+<<<<<<< HEAD
 character-entities-legacy@^3.0.0:
  version "3.0.0"
  resolved "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-3.0.0.tgz"
  integrity sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==

+=======
+>>>>>>> origin/master
 character-entities@^1.0.0:
  version "1.2.4"
  resolved "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz"
  integrity sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==

+<<<<<<< HEAD
 character-entities@^2.0.0:
  version "2.0.2"
  resolved "https://registry.npmjs.org/character-entities/-/character-entities-2.0.2.tgz"
  integrity sha512-shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ==

+=======
+>>>>>>> origin/master
 character-reference-invalid@^1.0.0:
  version "1.1.4"
  resolved "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz"
  integrity sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==

+<<<<<<< HEAD
 character-reference-invalid@^2.0.0:
  version "2.0.1"
  resolved "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-2.0.1.tgz"
  integrity sha512-iBZ4F4wRbyORVsu0jPV7gXkOsGYjGHPmAyv+HiHG8gi5PtC9KI2j1+v8/tlibRvjoWX027ypmG/n0HtO5t7unw==

+=======
+>>>>>>> origin/master
 cheerio-select@^2.1.0:
  version "2.1.0"
  resolved "https://registry.npmjs.org/cheerio-select/-/cheerio-select-2.1.0.tgz"
@ -3161,11 +3235,14 @@ collapse-white-space@^1.0.2:
  resolved "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.6.tgz"
  integrity sha512-jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ==

+<<<<<<< HEAD
 collapse-white-space@^2.0.0:
  version "2.1.0"
  resolved "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-2.1.0.tgz"
  integrity sha512-loKTxY1zCOuG4j9f6EPnuyyYkf58RnhhWTvRoZEokgB+WbdXehfjFviyOVYkqzEWz1Q5kRiZdBYS5SwxbQYwzw==

+=======
+>>>>>>> origin/master
 color-convert@^1.9.0:
  version "1.9.3"
  resolved "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"
@ -3210,11 +3287,14 @@ comma-separated-tokens@^1.0.0:
  resolved "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz"
  integrity sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw==

+<<<<<<< HEAD
 comma-separated-tokens@^2.0.0:
  version "2.0.3"
  resolved "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz"
  integrity sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==

+=======
+>>>>>>> origin/master
 commander@^2.20.0:
  version "2.20.3"
  resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"
@ -3552,7 +3632,11 @@ debug@^2.6.0:
  dependencies:
    ms "2.0.0"

+<<<<<<< HEAD
 debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@4:
+=======
+debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@4:
+>>>>>>> origin/master
  version "4.3.4"
  resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@ -3566,6 +3650,7 @@ debug@2.6.9:
  dependencies:
    ms "2.0.0"

+<<<<<<< HEAD
 decode-named-character-reference@^1.0.0:
  version "1.0.2"
  resolved "https://registry.npmjs.org/decode-named-character-reference/-/decode-named-character-reference-1.0.2.tgz"
@ -3573,6 +3658,8 @@ decode-named-character-reference@^1.0.0:
  dependencies:
    character-entities "^2.0.0"

+=======
+>>>>>>> origin/master
 decompress-response@^3.3.0:
  version "3.3.0"
  resolved "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz"
@ -3639,11 +3726,14 @@ depd@2.0.0:
  resolved "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz"
  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==

+<<<<<<< HEAD
 dequal@^2.0.0:
  version "2.0.3"
  resolved "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz"
  integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==

+=======
+>>>>>>> origin/master
 destroy@1.2.0:
  version "1.2.0"
  resolved "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz"
@ -3677,6 +3767,7 @@ detect-port@^1.3.0:
    address "^1.0.1"
    debug "4"

+<<<<<<< HEAD
 devlop@^1.0.0, devlop@^1.1.0:
  version "1.1.0"
  resolved "https://registry.npmjs.org/devlop/-/devlop-1.1.0.tgz"
@ -3684,6 +3775,8 @@ devlop@^1.0.0, devlop@^1.1.0:
  dependencies:
    dequal "^2.0.0"

+=======
+>>>>>>> origin/master
 dir-glob@^3.0.1:
  version "3.0.1"
  resolved "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz"
@ -3935,6 +4028,7 @@ estraverse@^5.2.0:
  resolved "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"
  integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==

+<<<<<<< HEAD
 estree-util-attach-comments@^3.0.0:
  version "3.0.0"
  resolved "https://registry.npmjs.org/estree-util-attach-comments/-/estree-util-attach-comments-3.0.0.tgz"
@ -3981,6 +4075,8 @@ estree-walker@^3.0.0:
  dependencies:
    "@types/estree" "^1.0.0"

+=======
+>>>>>>> origin/master
 esutils@^2.0.2:
  version "2.0.3"
  resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"
@ -4552,6 +4648,7 @@ hast-util-raw@6.0.1:
    xtend "^4.0.0"
    zwitch "^1.0.0"

+<<<<<<< HEAD
 hast-util-to-estree@^3.0.0:
  version "3.1.0"
  resolved "https://registry.npmjs.org/hast-util-to-estree/-/hast-util-to-estree-3.1.0.tgz"
@ -4595,6 +4692,8 @@ hast-util-to-jsx-runtime@^2.0.0:
    unist-util-position "^5.0.0"
    vfile-message "^4.0.0"

+=======
+>>>>>>> origin/master
 hast-util-to-parse5@^6.0.0:
  version "6.0.0"
  resolved "https://registry.npmjs.org/hast-util-to-parse5/-/hast-util-to-parse5-6.0.0.tgz"
@ -4606,6 +4705,7 @@ hast-util-to-parse5@^6.0.0:
    xtend "^4.0.0"
    zwitch "^1.0.0"

+<<<<<<< HEAD
 hast-util-whitespace@^3.0.0:
  version "3.0.0"
  resolved "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-3.0.0.tgz"
@ -4613,6 +4713,8 @@ hast-util-whitespace@^3.0.0:
  dependencies:
    "@types/hast" "^3.0.0"

+=======
+>>>>>>> origin/master
 hastscript@^6.0.0:
  version "6.0.0"
  resolved "https://registry.npmjs.org/hastscript/-/hastscript-6.0.0.tgz"
@ -4878,11 +4980,14 @@ inline-style-parser@0.1.1:
  resolved "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.1.1.tgz"
  integrity sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==

+<<<<<<< HEAD
 inline-style-parser@0.2.3:
  version "0.2.3"
  resolved "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.2.3.tgz"
  integrity sha512-qlD8YNDqyTKTyuITrDOffsl6Tdhv+UC4hcdAVuQsK4IMQ99nSgd1MIA/Q+jQYoh9r3hVUXhYh7urSRmXPkW04g==

+=======
+>>>>>>> origin/master
 interpret@^1.0.0:
  version "1.4.0"
  resolved "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz"
@ -4910,11 +5015,14 @@ is-alphabetical@^1.0.0, is-alphabetical@1.0.4:
  resolved "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz"
  integrity sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==

+<<<<<<< HEAD
 is-alphabetical@^2.0.0:
  version "2.0.1"
  resolved "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-2.0.1.tgz"
  integrity sha512-FWyyY60MeTNyeSRpkM2Iry0G9hpr7/9kD40mD/cGQEuilcZYS4okz8SN2Q6rLCJ8gbCt6fN+rC+6tMGS99LaxQ==

+=======
+>>>>>>> origin/master
 is-alphanumerical@^1.0.0:
  version "1.0.4"
  resolved "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz"
@ -4923,6 +5031,7 @@ is-alphanumerical@^1.0.0:
    is-alphabetical "^1.0.0"
    is-decimal "^1.0.0"

+<<<<<<< HEAD
 is-alphanumerical@^2.0.0:
  version "2.0.1"
  resolved "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-2.0.1.tgz"
@ -4931,6 +5040,8 @@ is-alphanumerical@^2.0.0:
    is-alphabetical "^2.0.0"
    is-decimal "^2.0.0"

+=======
+>>>>>>> origin/master
 is-arrayish@^0.2.1:
  version "0.2.1"
  resolved "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"
@ -4967,11 +5078,14 @@ is-decimal@^1.0.0:
  resolved "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz"
  integrity sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==

+<<<<<<< HEAD
 is-decimal@^2.0.0:
  version "2.0.1"
  resolved "https://registry.npmjs.org/is-decimal/-/is-decimal-2.0.1.tgz"
  integrity sha512-AAB9hiomQs5DXWcRB1rqsxGUstbRroFOPPVAomNk/3XHR5JyEZChOyTWe2oayKnsSsr/kcGqF+z6yuH6HHpN0A==

+=======
+>>>>>>> origin/master
 is-docker@^2.0.0, is-docker@^2.1.1:
  version "2.2.1"
  resolved "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz"
@ -5004,11 +5118,14 @@ is-hexadecimal@^1.0.0:
  resolved "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz"
  integrity sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==

+<<<<<<< HEAD
 is-hexadecimal@^2.0.0:
  version "2.0.1"
  resolved "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-2.0.1.tgz"
  integrity sha512-DgZQp241c8oO6cA1SbTEWiXeoxV42vlcJxgH+B3hi1AiqqKruZR3ZGF8In3fj4+/y/7rHvlOZLZtgJ/4ttYGZg==

+=======
+>>>>>>> origin/master
 is-installed-globally@^0.4.0:
  version "0.4.0"
  resolved "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz"
@ -5057,11 +5174,14 @@ is-plain-obj@^3.0.0:
  resolved "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz"
  integrity sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==

+<<<<<<< HEAD
 is-plain-obj@^4.0.0:
  version "4.1.0"
  resolved "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz"
  integrity sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==

+=======
+>>>>>>> origin/master
 is-plain-object@^2.0.4:
  version "2.0.4"
  resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"
@ -5069,6 +5189,7 @@ is-plain-object@^2.0.4:
  dependencies:
    isobject "^3.0.1"

+<<<<<<< HEAD
 is-reference@^3.0.0:
  version "3.0.2"
  resolved "https://registry.npmjs.org/is-reference/-/is-reference-3.0.2.tgz"
@ -5076,6 +5197,8 @@ is-reference@^3.0.0:
  dependencies:
    "@types/estree" "*"

+=======
+>>>>>>> origin/master
 is-regexp@^1.0.0:
  version "1.0.0"
  resolved "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz"
@ -5366,11 +5489,14 @@ lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21:
  resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"
  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==

+<<<<<<< HEAD
 longest-streak@^3.0.0:
  version "3.1.0"
  resolved "https://registry.npmjs.org/longest-streak/-/longest-streak-3.1.0.tgz"
  integrity sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g==

+=======
+>>>>>>> origin/master
 loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
  version "1.4.0"
  resolved "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz"
@ -5429,11 +5555,14 @@ markdown-escapes@^1.0.0:
  resolved "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.4.tgz"
  integrity sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==

+<<<<<<< HEAD
 markdown-extensions@^2.0.0:
  version "2.0.0"
  resolved "https://registry.npmjs.org/markdown-extensions/-/markdown-extensions-2.0.0.tgz"
  integrity sha512-o5vL7aDWatOTX8LzaS1WMoaoxIiLRQJuIKKe2wAw6IeULDHaqbiqiggmx+pKvZDb1Sj+pE46Sn1T7lCqfFtg1Q==

+=======
+>>>>>>> origin/master
 mdast-squeeze-paragraphs@^4.0.0:
  version "4.0.0"
  resolved "https://registry.npmjs.org/mdast-squeeze-paragraphs/-/mdast-squeeze-paragraphs-4.0.0.tgz"
@ -5448,6 +5577,7 @@ mdast-util-definitions@^4.0.0:
  dependencies:
    unist-util-visit "^2.0.0"

+<<<<<<< HEAD
 mdast-util-from-markdown@^2.0.0:
  version "2.0.1"
  resolved "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-2.0.1.tgz"
@ -5543,6 +5673,8 @@ mdast-util-to-hast@^13.0.0:
    unist-util-visit "^5.0.0"
    vfile "^6.0.0"

+=======
+>>>>>>> origin/master
 mdast-util-to-hast@10.0.1:
  version "10.0.1"
  resolved "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-10.0.1.tgz"
@ -5557,6 +5689,7 @@ mdast-util-to-hast@10.0.1:
    unist-util-position "^3.0.0"
    unist-util-visit "^2.0.0"

+<<<<<<< HEAD
 mdast-util-to-markdown@^2.0.0:
  version "2.1.0"
  resolved "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-2.1.0.tgz"
@ -5571,11 +5704,14 @@ mdast-util-to-markdown@^2.0.0:
    unist-util-visit "^5.0.0"
    zwitch "^2.0.0"

+=======
+>>>>>>> origin/master
 mdast-util-to-string@^2.0.0:
  version "2.0.0"
  resolved "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz"
  integrity sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==

+<<<<<<< HEAD
 mdast-util-to-string@^4.0.0:
  version "4.0.0"
  resolved "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-4.0.0.tgz"
@ -5583,6 +5719,8 @@ mdast-util-to-string@^4.0.0:
  dependencies:
    "@types/mdast" "^4.0.0"

+=======
+>>>>>>> origin/master
 mdn-data@2.0.14:
  version "2.0.14"
  resolved "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz"
@ -5630,6 +5768,7 @@ methods@~1.1.2:
  resolved "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"
  integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==

+<<<<<<< HEAD
 micromark-core-commonmark@^2.0.0:
  version "2.0.1"
  resolved "https://registry.npmjs.org/micromark-core-commonmark/-/micromark-core-commonmark-2.0.1.tgz"
@ -5918,6 +6057,8 @@ micromark@^4.0.0:
    micromark-util-symbol "^2.0.0"
    micromark-util-types "^2.0.0"

+=======
+>>>>>>> origin/master
 micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5:
  version "4.0.5"
  resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz"
@ -6296,6 +6437,7 @@ parse-entities@^2.0.0:
    is-decimal "^1.0.0"
    is-hexadecimal "^1.0.0"

+<<<<<<< HEAD
 parse-entities@^4.0.0:
  version "4.0.1"
  resolved "https://registry.npmjs.org/parse-entities/-/parse-entities-4.0.1.tgz"
@ -6310,6 +6452,8 @@ parse-entities@^4.0.0:
    is-decimal "^2.0.0"
    is-hexadecimal "^2.0.0"

+=======
+>>>>>>> origin/master
 parse-json@^5.0.0:
  version "5.2.0"
  resolved "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz"
@ -6422,6 +6566,7 @@ path-type@^4.0.0:
  resolved "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"
  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==

+<<<<<<< HEAD
 periscopic@^3.0.0:
  version "3.1.0"
  resolved "https://registry.npmjs.org/periscopic/-/periscopic-3.1.0.tgz"
@ -6431,6 +6576,8 @@ periscopic@^3.0.0:
    estree-walker "^3.0.0"
    is-reference "^3.0.0"

+=======
+>>>>>>> origin/master
 picocolors@^1.0.0:
  version "1.0.0"
  resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"
@ -6807,13 +6954,18 @@ prop-types@^15.6.2, prop-types@^15.7.2:
    object-assign "^4.1.1"
    react-is "^16.13.1"

+<<<<<<< HEAD
 property-information@^5.0.0:
+=======
+property-information@^5.0.0, property-information@^5.3.0:
+>>>>>>> origin/master
  version "5.6.0"
  resolved "https://registry.npmjs.org/property-information/-/property-information-5.6.0.tgz"
  integrity sha512-YUHSPk+A30YPv+0Qf8i9Mbfe/C0hdPXk1s1jPVToV8pk8BQtpw10ct89Eo7OWkutrwqvT0eicAxlOg3dOAu8JA==
  dependencies:
    xtend "^4.0.0"

+<<<<<<< HEAD
 property-information@^5.3.0:
  version "5.6.0"
  resolved "https://registry.npmjs.org/property-information/-/property-information-5.6.0.tgz"
@ -6826,6 +6978,8 @@ property-information@^6.0.0:
  resolved "https://registry.npmjs.org/property-information/-/property-information-6.5.0.tgz"
  integrity sha512-PgTgs/BlvHxOu8QuEN7wi5A0OmXaBcHpmCSTehcs6Uuu9IkDIEo13Hy7n898RHfrQ49vKCoGeWZSaAK01nwVig==

+=======
+>>>>>>> origin/master
 proxy-addr@~2.0.7:
  version "2.0.7"
  resolved "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz"
@ -7221,6 +7375,7 @@ remark-footnotes@2.0.0:
  resolved "https://registry.npmjs.org/remark-footnotes/-/remark-footnotes-2.0.0.tgz"
  integrity sha512-3Clt8ZMH75Ayjp9q4CorNeyjwIxHFcTkaektplKGl2A1jNGEUey8cKL0ZC5vJwfcD5GFGsNLImLG/NGzWIzoMQ==

+<<<<<<< HEAD
 remark-mdx@^3.0.0:
  version "3.0.1"
  resolved "https://registry.npmjs.org/remark-mdx/-/remark-mdx-3.0.1.tgz"
@ -7229,6 +7384,8 @@ remark-mdx@^3.0.0:
    mdast-util-mdx "^3.0.0"
    micromark-extension-mdxjs "^3.0.0"

+=======
+>>>>>>> origin/master
 remark-mdx@1.6.22:
  version "1.6.22"
  resolved "https://registry.npmjs.org/remark-mdx/-/remark-mdx-1.6.22.tgz"
@ -7243,6 +7400,7 @@ remark-mdx@1.6.22:
    remark-parse "8.0.3"
    unified "9.2.0"

+<<<<<<< HEAD
 remark-parse@^11.0.0:
  version "11.0.0"
  resolved "https://registry.npmjs.org/remark-parse/-/remark-parse-11.0.0.tgz"
@ -7253,6 +7411,8 @@ remark-parse@^11.0.0:
    micromark-util-types "^2.0.0"
    unified "^11.0.0"

+=======
+>>>>>>> origin/master
 remark-parse@8.0.3:
  version "8.0.3"
  resolved "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.3.tgz"
@ -7275,6 +7435,7 @@ remark-parse@8.0.3:
    vfile-location "^3.0.0"
    xtend "^4.0.1"

+<<<<<<< HEAD
 remark-rehype@^11.0.0:
  version "11.1.0"
  resolved "https://registry.npmjs.org/remark-rehype/-/remark-rehype-11.1.0.tgz"
@ -7286,6 +7447,8 @@ remark-rehype@^11.0.0:
    unified "^11.0.0"
    vfile "^6.0.0"

+=======
+>>>>>>> origin/master
 remark-squeeze-paragraphs@4.0.0:
  version "4.0.0"
  resolved "https://registry.npmjs.org/remark-squeeze-paragraphs/-/remark-squeeze-paragraphs-4.0.0.tgz"
@ -7519,9 +7682,15 @@ semver-diff@^3.1.1:
    semver "^6.3.0"

 semver@^5.4.1:
+<<<<<<< HEAD
  version "5.7.2"
  resolved "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz"
  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
+=======
+  version "5.7.1"
+  resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+>>>>>>> origin/master

 semver@^6.0.0:
  version "6.3.0"
@ -7756,21 +7925,27 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0:
  resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"
  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==

+<<<<<<< HEAD
 source-map@^0.7.0:
  version "0.7.4"
  resolved "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz"
  integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==

+=======
+>>>>>>> origin/master
 space-separated-tokens@^1.0.0:
  version "1.1.5"
  resolved "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz"
  integrity sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA==

+<<<<<<< HEAD
 space-separated-tokens@^2.0.0:
  version "2.0.2"
  resolved "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz"
  integrity sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==

+=======
+>>>>>>> origin/master
 spdy-transport@^3.0.0:
  version "3.0.0"
  resolved "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz"
@ -7865,6 +8040,7 @@ string-width@^5.0.1:
    emoji-regex "^9.2.2"
    strip-ansi "^7.0.1"

+<<<<<<< HEAD
 stringify-entities@^4.0.0:
  version "4.0.4"
  resolved "https://registry.npmjs.org/stringify-entities/-/stringify-entities-4.0.4.tgz"
@ -7873,6 +8049,8 @@ stringify-entities@^4.0.0:
    character-entities-html4 "^2.0.0"
    character-entities-legacy "^3.0.0"

+=======
+>>>>>>> origin/master
 stringify-object@^3.3.0:
  version "3.3.0"
  resolved "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz"
@ -7916,6 +8094,7 @@ strip-json-comments@~2.0.1:
  resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"
  integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==

+<<<<<<< HEAD
 style-to-object@^0.3.0:
  version "0.3.0"
  resolved "https://registry.npmjs.org/style-to-object/-/style-to-object-0.3.0.tgz"
@ -7938,6 +8117,9 @@ style-to-object@^1.0.0:
    inline-style-parser "0.2.3"

 style-to-object@0.3.0:
+=======
+style-to-object@^0.3.0, style-to-object@0.3.0:
+>>>>>>> origin/master
  version "0.3.0"
  resolved "https://registry.npmjs.org/style-to-object/-/style-to-object-0.3.0.tgz"
  integrity sha512-CzFnRRXhzWIdItT3OmF8SQfWyahHhjq3HwcMNCNLn+N7klOOqPjMeG/4JSu77D7ypZdGvSzvkrbyeTMizz2VrA==
@ -8079,11 +8261,14 @@ tr46@~0.0.3:
  resolved "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz"
  integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==

+<<<<<<< HEAD
 trim-lines@^3.0.0:
  version "3.0.1"
  resolved "https://registry.npmjs.org/trim-lines/-/trim-lines-3.0.1.tgz"
  integrity sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==

+=======
+>>>>>>> origin/master
 trim-trailing-lines@^1.0.0:
  version "1.1.4"
  resolved "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.4.tgz"
@ -8099,11 +8284,14 @@ trough@^1.0.0:
  resolved "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz"
  integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==

+<<<<<<< HEAD
 trough@^2.0.0:
  version "2.2.0"
  resolved "https://registry.npmjs.org/trough/-/trough-2.2.0.tgz"
  integrity sha512-tmMpK00BjZiUyVyvrBK7knerNgmgvcV/KLVyuma/SC+TQN167GrMRciANTz09+k3zW8L8t60jWO1GpfkZdjTaw==

+=======
+>>>>>>> origin/master
 tslib@^2.0.3, tslib@^2.1.0, tslib@^2.4.0:
  version "2.4.1"
  resolved "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz"
@ -8175,6 +8363,7 @@ unicode-property-aliases-ecmascript@^2.0.0:
  resolved "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz"
  integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==

+<<<<<<< HEAD
 unified@^11.0.0:
  version "11.0.4"
  resolved "https://registry.npmjs.org/unified/-/unified-11.0.4.tgz"
@ -8188,6 +8377,8 @@ unified@^11.0.0:
    trough "^2.0.0"
    vfile "^6.0.0"

+=======
+>>>>>>> origin/master
 unified@^9.2.2:
  version "9.2.2"
  resolved "https://registry.npmjs.org/unified/-/unified-9.2.2.tgz"
@ -8234,6 +8425,7 @@ unist-util-is@^4.0.0:
  resolved "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz"
  integrity sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==

+<<<<<<< HEAD
 unist-util-is@^6.0.0:
  version "6.0.0"
  resolved "https://registry.npmjs.org/unist-util-is/-/unist-util-is-6.0.0.tgz"
@ -8248,11 +8440,14 @@ unist-util-position-from-estree@^2.0.0:
  dependencies:
    "@types/unist" "^3.0.0"

+=======
+>>>>>>> origin/master
 unist-util-position@^3.0.0:
  version "3.1.0"
  resolved "https://registry.npmjs.org/unist-util-position/-/unist-util-position-3.1.0.tgz"
  integrity sha512-w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA==

+<<<<<<< HEAD
 unist-util-position@^5.0.0:
  version "5.0.0"
  resolved "https://registry.npmjs.org/unist-util-position/-/unist-util-position-5.0.0.tgz"
@ -8260,6 +8455,8 @@ unist-util-position@^5.0.0:
  dependencies:
    "@types/unist" "^3.0.0"

+=======
+>>>>>>> origin/master
 unist-util-remove-position@^2.0.0:
  version "2.0.1"
  resolved "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz"
@ -8267,6 +8464,7 @@ unist-util-remove-position@^2.0.0:
  dependencies:
    unist-util-visit "^2.0.0"

+<<<<<<< HEAD
 unist-util-remove-position@^5.0.0:
  version "5.0.0"
  resolved "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-5.0.0.tgz"
@ -8275,6 +8473,8 @@ unist-util-remove-position@^5.0.0:
    "@types/unist" "^3.0.0"
    unist-util-visit "^5.0.0"

+=======
+>>>>>>> origin/master
 unist-util-remove@^2.0.0:
  version "2.1.0"
  resolved "https://registry.npmjs.org/unist-util-remove/-/unist-util-remove-2.1.0.tgz"
@ -8289,6 +8489,7 @@ unist-util-stringify-position@^2.0.0:
  dependencies:
    "@types/unist" "^2.0.2"

+<<<<<<< HEAD
 unist-util-stringify-position@^4.0.0:
  version "4.0.0"
  resolved "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz"
@ -8296,6 +8497,8 @@ unist-util-stringify-position@^4.0.0:
  dependencies:
    "@types/unist" "^3.0.0"

+=======
+>>>>>>> origin/master
 unist-util-visit-parents@^3.0.0:
  version "3.1.1"
  resolved "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz"
@ -8304,6 +8507,7 @@ unist-util-visit-parents@^3.0.0:
    "@types/unist" "^2.0.0"
    unist-util-is "^4.0.0"

+<<<<<<< HEAD
 unist-util-visit-parents@^6.0.0:
  version "6.0.1"
  resolved "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-6.0.1.tgz"
@ -8312,6 +8516,8 @@ unist-util-visit-parents@^6.0.0:
    "@types/unist" "^3.0.0"
    unist-util-is "^6.0.0"

+=======
+>>>>>>> origin/master
 unist-util-visit@^2.0.0, unist-util-visit@^2.0.3, unist-util-visit@2.0.3:
  version "2.0.3"
  resolved "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz"
@ -8321,6 +8527,7 @@ unist-util-visit@^2.0.0, unist-util-visit@^2.0.3, unist-util-visit@2.0.3:
    unist-util-is "^4.0.0"
    unist-util-visit-parents "^3.0.0"

+<<<<<<< HEAD
 unist-util-visit@^5.0.0:
  version "5.0.0"
  resolved "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-5.0.0.tgz"
@ -8330,6 +8537,8 @@ unist-util-visit@^5.0.0:
    unist-util-is "^6.0.0"
    unist-util-visit-parents "^6.0.0"

+=======
+>>>>>>> origin/master
 universalify@^2.0.0:
  version "2.0.0"
  resolved "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz"
@ -8469,6 +8678,7 @@ vfile-message@^2.0.0:
    "@types/unist" "^2.0.0"
    unist-util-stringify-position "^2.0.0"

+<<<<<<< HEAD
 vfile-message@^4.0.0:
  version "4.0.2"
  resolved "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.2.tgz"
@ -8477,6 +8687,8 @@ vfile-message@^4.0.0:
    "@types/unist" "^3.0.0"
    unist-util-stringify-position "^4.0.0"

+=======
+>>>>>>> origin/master
 vfile@^4.0.0:
  version "4.2.1"
  resolved "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz"
@ -8487,6 +8699,7 @@ vfile@^4.0.0:
    unist-util-stringify-position "^2.0.0"
    vfile-message "^2.0.0"

+<<<<<<< HEAD
 vfile@^6.0.0:
  version "6.0.1"
  resolved "https://registry.npmjs.org/vfile/-/vfile-6.0.1.tgz"
@ -8496,6 +8709,8 @@ vfile@^6.0.0:
    unist-util-stringify-position "^4.0.0"
    vfile-message "^4.0.0"

+=======
+>>>>>>> origin/master
 wait-on@^6.0.1:
  version "6.0.1"
  resolved "https://registry.npmjs.org/wait-on/-/wait-on-6.0.1.tgz"
@ -8613,7 +8828,11 @@ webpack-sources@^3.2.2, webpack-sources@^3.2.3:
  resolved "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz"
  integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==

+<<<<<<< HEAD
 "webpack@^4.0.0 || ^5.0.0", "webpack@^4.37.0 || ^5.0.0", webpack@^5.0.0, webpack@^5.1.0, webpack@^5.20.0, webpack@^5.73.0, "webpack@>= 4", webpack@>=2, "webpack@>=4.41.1 || 5.x", webpack@>=5, "webpack@3 || 4 || 5":
+=======
+"webpack@^4.0.0 || ^5.0.0", "webpack@^4.37.0 || ^5.0.0", webpack@^5.0.0, webpack@^5.1.0, webpack@^5.20.0, webpack@^5.73.0, "webpack@>= 4", webpack@>=2, "webpack@>=4.41.1 || 5.x", "webpack@3 || 4 || 5":
+>>>>>>> origin/master
  version "5.76.3"
  resolved "https://registry.npmjs.org/webpack/-/webpack-5.76.3.tgz"
  integrity sha512-18Qv7uGPU8b2vqGeEEObnfICyw2g39CHlDEK4I7NK13LOur1d0HGmGNKGT58Eluwddpn3oEejwvBPoP4M7/KSA==
@ -8787,8 +9006,11 @@ zwitch@^1.0.0:
  version "1.0.5"
  resolved "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz"
  integrity sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==
+<<<<<<< HEAD

 zwitch@^2.0.0:
  version "2.0.4"
  resolved "https://registry.npmjs.org/zwitch/-/zwitch-2.0.4.tgz"
  integrity sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==
+=======
+>>>>>>> origin/master
				`@ -0,0 +1 @@`
				`Subproject commit 9768ca9d069b956afe60a6631fc291d12d20faa1`