GitLab UI integration branch for 1226-make-popover-focus-by-default

4a7d9b6d · GitLab Bot · Paul Gascou-Vaillancourt · 98564fc2 · 4a7d9b6d
Commit 4a7d9b6d authored Mar 16, 2021 by GitLab Bot Committed by Paul Gascou-Vaillancourt Mar 24, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 12 deletions

yarn.lock yarn.lock +0 -12

No files found.
--- a/yarn.lock
+++ b/yarn.lock
@@ -5892,22 +5892,10 @@ he@^1.1.0, he@^1.1.1, he@^1.2.0:
  resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
  integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==

-<<<<<<< HEAD
 highlight.js@^10.6.0, highlight.js@~10.6.0:
  version "10.6.0"
  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.6.0.tgz#0073aa71d566906965ba6e1b7be7b2682f5e18b6"
  integrity sha512-8mlRcn5vk/r4+QcqerapwBYTe+iPL5ih6xrNylxrnBdHQiijDETfXX7VIxC3UiCRiINBJfANBAsPzAvRQj8RpQ==
-=======
-highlight.js@^10.6.0:
-  version "10.6.0"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.6.0.tgz#0073aa71d566906965ba6e1b7be7b2682f5e18b6"
-  integrity sha512-8mlRcn5vk/r4+QcqerapwBYTe+iPL5ih6xrNylxrnBdHQiijDETfXX7VIxC3UiCRiINBJfANBAsPzAvRQj8RpQ==
-
-highlight.js@~9.13.0:
-  version "9.13.1"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.13.1.tgz#054586d53a6863311168488a0f58d6c505ce641e"
-  integrity sha512-Sc28JNQNDzaH6PORtRLMvif9RSn1mYuOoX3omVjnb0+HbpPygU2ALBI0R/wsiqCb4/fcp07Gdo8g+fhtFrQl6A==
->>>>>>> 21a4cfe5a5c (GitLab UI integration branch for 1226-make-popover-focus-by-default)

 hmac-drbg@^1.0.1:
  version "1.0.1"