update

artsy · Jan 16, 2025 · 6424c91 · 6424c91
1 parent dcbb40d
commit 6424c91
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/yarn.lock b/yarn.lock
@@ -15,6 +15,7 @@
     "@jridgewell/gen-mapping" "^0.3.5"
     "@jridgewell/trace-mapping" "^0.3.24"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 "@artsy/[email protected]":
@@ -25,10 +26,13 @@
 =======
 >>>>>>> c85e46a665 (update)
 <<<<<<< HEAD
+=======
+>>>>>>> 45c3d80f5d (update)
 "@artsy/[email protected]":
   version "4.223.0"
   resolved "https://registry.yarnpkg.com/@artsy/cohesion/-/cohesion-4.223.0.tgz#5817e34184f22780df2195207fc27126d4406009"
   integrity sha512-IvUIECyARCldivlGldVVmr3ckBZU9uaT7MZL3A2zjuj9uUPlRdnQGrLY2t4qFavhdr3f5jixQ871rUciGo7j7w==
+<<<<<<< HEAD
 =======
 "@artsy/[email protected]":
   version "4.219.0"
@@ -45,6 +49,8 @@
   integrity sha512-B0GdaXIYCINZ3BzHJC0Zu/dkfeGwq/dkFNzG6tNXaAyrhKN6dfgGrdJpbQxOt+IJA1cQk9EOQek6V/bskemmiw==
 >>>>>>> 4a7edf88bc (update)
 >>>>>>> c85e46a665 (update)
+=======
+>>>>>>> 45c3d80f5d (update)
   dependencies:
     core-js "3"