merge conflict

liu-samuel · liu-samuel · commit d71008a6364e · 2024-12-18T17:52:22.000-05:00
diff --git a/yarn.lock b/yarn.lock
@@ -12385,7 +12385,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nanoid@npm:^3.3.7":
+"nanoid@npm:^3.0.0, nanoid@npm:^3.3.7":
   version: 3.3.8
   resolution: "nanoid@npm:3.3.8"
   bin:
