+
+
{{/unless}}
{{/if}}
{{/each}}
diff --git a/yarn.lock b/yarn.lock
index 18d3e1c74..2ae88ecc3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7617,7 +7617,25 @@ debug@^3.0.0, debug@^3.0.1, debug@^3.1.0, debug@^3.1.1, debug@^3.2.6:
dependencies:
ms "^2.1.1"
+<<<<<<< HEAD
debuglog@^1.0.1:
+=======
+<<<<<<< HEAD
+debuglog@*, debuglog@^1.0.1:
+=======
+<<<<<<< HEAD
+=======
+debug@~4.1.0:
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
+ integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
+ dependencies:
+ ms "^2.1.1"
+
+>>>>>>> aee23f84 (Stop using a bare dialog and start using the Dialog Detail component)
+debuglog@^1.0.1:
+>>>>>>> e9b16588 (Stop using a bare dialog and start using the Dialog Detail component)
+>>>>>>> 842918fe (Stop using a bare dialog and start using the Dialog Detail component)
version "1.0.1"
resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=