diff --git a/.licenses/npm/form-data-2.5.5.dep.yml b/.licenses/npm/form-data-2.5.5.dep.yml index 2cd909e..fc5fc9e 100644 --- a/.licenses/npm/form-data-2.5.5.dep.yml +++ b/.licenses/npm/form-data-2.5.5.dep.yml @@ -4,11 +4,9 @@ version: 2.5.5 type: npm summary: A library to create readable "multipart/form-data" streams. Can be used to submit forms and file uploads to other web applications. -<<<<<<< HEAD -homepage: -======= + homepage: ->>>>>>> origin/main + license: mit licenses: - sources: License diff --git a/.licenses/npm/form-data-4.0.4.dep.yml b/.licenses/npm/form-data-4.0.4.dep.yml index 67c97e6..7352797 100644 --- a/.licenses/npm/form-data-4.0.4.dep.yml +++ b/.licenses/npm/form-data-4.0.4.dep.yml @@ -4,11 +4,7 @@ version: 4.0.4 type: npm summary: A library to create readable "multipart/form-data" streams. Can be used to submit forms and file uploads to other web applications. -<<<<<<< HEAD -homepage: -======= homepage: ->>>>>>> origin/main license: mit licenses: - sources: License diff --git a/.licenses/npm/function-bind.dep.yml b/.licenses/npm/function-bind.dep.yml index 9d5b70a..85086ce 100644 --- a/.licenses/npm/function-bind.dep.yml +++ b/.licenses/npm/function-bind.dep.yml @@ -29,7 +29,3 @@ licenses: THE SOFTWARE. notices: [] -<<<<<<< HEAD -... -======= ->>>>>>> origin/main