Browse Source

conflict

dependabot/npm_and_yarn/dero-benchmark-vue/ssri-6.0.2
Slixe 2 years ago
parent
commit
40c2a526cb
1 changed files with 3 additions and 0 deletions
  1. +3
    -0
      dero-benchmark-vue/yarn.lock

+ 3
- 0
dero-benchmark-vue/yarn.lock View File

@@ -8377,6 +8377,7 @@ websocket-extensions@>=0.1.1:
version "0.1.4"
resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
<<<<<<< HEAD

which-boxed-primitive@^1.0.1:
version "1.0.2"
@@ -8388,6 +8389,8 @@ which-boxed-primitive@^1.0.1:
is-number-object "^1.0.4"
is-string "^1.0.5"
is-symbol "^1.0.3"
=======
>>>>>>> 38afd52606c89a33b02311577bc9da2bd05a0a2b

which-module@^2.0.0:
version "2.0.0"


Loading…
Cancel
Save