|
@@ -1906,15 +1906,9 @@ date-now@^0.1.4:
|
|
|
integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=
|
|
|
|
|
|
dayjs@^1.10.7:
|
|
|
-<<<<<<< HEAD
|
|
|
- version "1.11.2"
|
|
|
- resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.2.tgz#fa0f5223ef0d6724b3d8327134890cfe3d72fbe5"
|
|
|
- integrity sha512-F4LXf1OeU9hrSYRPTTj/6FbO4HTjPKXvEIC1P2kcnFurViINCVk3ZV0xAS3XVx9MkMsXbbqlK6hjseaYbgKEHw==
|
|
|
-=======
|
|
|
version "1.11.0"
|
|
|
resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.0.tgz#009bf7ef2e2ea2d5db2e6583d2d39a4b5061e805"
|
|
|
integrity sha512-JLC809s6Y948/FuCZPm5IX8rRhQwOiyMb2TfVVQEixG7P8Lm/gt5S7yoQZmC8x1UehI9Pb7sksEt4xx14m+7Ug==
|
|
|
->>>>>>> 90c5017b592ac21c3f13583162127cd44c824315
|
|
|
|
|
|
debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.6, debug@^2.6.8, debug@^2.6.9:
|
|
|
version "2.6.9"
|