|
@@ -3752,7 +3752,11 @@ mdast-util-from-markdown@^0.8.5:
|
|
|
parse-entities "^2.0.0"
|
|
|
unist-util-stringify-position "^2.0.0"
|
|
|
|
|
|
+<<<<<<< Updated upstream
|
|
|
mdast-util-from-markdown@^1.0.0, mdast-util-from-markdown@^1.1.0, mdast-util-from-markdown@^1.3.0:
|
|
|
+=======
|
|
|
+mdast-util-from-markdown@^1.0.0, mdast-util-from-markdown@^1.1.0:
|
|
|
+>>>>>>> Stashed changes
|
|
|
version "1.3.1"
|
|
|
resolved "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-1.3.1.tgz"
|
|
|
integrity sha512-4xTO/M8c82qBcnQc1tgpNtubGUW/Y1tBQ1B0i5CtSoelOLKFYlElIr3bvgREYYO5iRqbMY1YuqZng0GVOI8Qww==
|
|
@@ -5368,11 +5372,14 @@ safe-regex@^2.1.1:
|
|
|
dependencies:
|
|
|
regexp-tree "~0.1.1"
|
|
|
|
|
|
+<<<<<<< Updated upstream
|
|
|
"safer-buffer@>= 2.1.2 < 3.0.0":
|
|
|
version "2.1.2"
|
|
|
resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"
|
|
|
integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
|
|
|
|
|
|
+=======
|
|
|
+>>>>>>> Stashed changes
|
|
|
sass@^1.61.0:
|
|
|
version "1.62.1"
|
|
|
resolved "https://registry.npmjs.org/sass/-/sass-1.62.1.tgz"
|
|
@@ -6120,11 +6127,14 @@ web-namespaces@^2.0.0:
|
|
|
resolved "https://registry.npmjs.org/web-namespaces/-/web-namespaces-2.0.1.tgz"
|
|
|
integrity sha512-bKr1DkiNa2krS7qxNtdrtHAmzuYGFQLiQ13TsorsdT6ULTkPLKuu5+GsFpDlg6JFjUTwX2DyhMPG2be8uPrqsQ==
|
|
|
|
|
|
+<<<<<<< Updated upstream
|
|
|
web-worker@^1.2.0:
|
|
|
version "1.2.0"
|
|
|
resolved "https://registry.npmjs.org/web-worker/-/web-worker-1.2.0.tgz"
|
|
|
integrity sha512-PgF341avzqyx60neE9DD+XS26MMNMoUQRz9NOZwW32nPQrF6p77f1htcnjBSEV8BGMKZ16choqUG4hyI0Hx7mA==
|
|
|
|
|
|
+=======
|
|
|
+>>>>>>> Stashed changes
|
|
|
which-boxed-primitive@^1.0.2:
|
|
|
version "1.0.2"
|
|
|
resolved "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz"
|