Merge branch 'main' into pr/1630

.licenses/npm/undici-types.dep.yml

@@ -1,16 +1,28 @@
 ---
+<<<<<<<< HEAD:.licenses/npm/undici-types.dep.yml
 name: undici-types
 version: 7.8.0
 type: npm
 summary: A stand-alone types package for Undici
 homepage: https://undici.nodejs.org
+========
+name: safe-buffer
+version: 5.2.1
+type: npm
+summary: Safer Node.js Buffer API
+homepage: https://github.com/feross/safe-buffer
+>>>>>>>> main:.licenses/npm/safe-buffer.dep.yml
 license: mit
 licenses:
 - sources: LICENSE
   text: |
     MIT License
 
+<<<<<<<< HEAD:.licenses/npm/undici-types.dep.yml
     Copyright (c) Matteo Collina and Undici contributors
+========
+    Copyright (c) Feross Aboukhadijeh
+>>>>>>>> main:.licenses/npm/safe-buffer.dep.yml
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal
@@ -27,6 +39,13 @@ licenses:
     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
     AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+<<<<<<<< HEAD:.licenses/npm/undici-types.dep.yml
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
+========
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+- sources: README.md
+  text: MIT. Copyright (C) [Feross Aboukhadijeh](http://feross.org)
+>>>>>>>> main:.licenses/npm/safe-buffer.dep.yml
 notices: []