fix: conflict

styled-components · May 4, 2023 · 38c05a9 · 38c05a9
2 parents 653d24a + 615fed9
commit 38c05a9
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/yarn.lock b/yarn.lock
@@ -10529,7 +10529,11 @@ __metadata:
   languageName: node
   linkType: hard
 
+<<<<<<< HEAD
 "yaml@npm:^2.2.2":
+=======
+"yaml@npm:^2.2.1":
+>>>>>>> upstream/main
   version: 2.2.2
   resolution: "yaml@npm:2.2.2"
   checksum: d90c235e099e30094dcff61ba3350437aef53325db4a6bcd04ca96e1bfe7e348b191f6a7a52b5211e2dbc4eeedb22a00b291527da030de7c189728ef3f2b4eb3