resolve conflicts

actions · Jan 22, 2025 · 80131ca · 80131ca
1 parent ee5b49c
commit 80131ca
Show file tree

Hide file tree

Showing 6 changed files with 83 additions and 883 deletions.
diff --git a/.licenses/npm/lru-cache.dep.yml b/.licenses/npm/lru-cache.dep.yml
diff --git a/.licenses/npm/semver-7.6.0.dep.yml → .licenses/npm/semver-7.6.3.dep.yml b/.licenses/npm/semver-7.6.0.dep.yml → .licenses/npm/semver-7.6.3.dep.yml
diff --git a/.licenses/npm/yallist.dep.yml b/.licenses/npm/yallist.dep.yml