Fix merge conflict

tapis-project · Jul 10, 2024 · 6d164fc · 6d164fc
2 parents 9272e5e + 4983da5
commit 6d164fc
Show file tree

Hide file tree

Showing 8 changed files with 371 additions and 370 deletions.
diff --git a/lib/icicle-tapisui-extension/package-lock.json b/lib/icicle-tapisui-extension/package-lock.json
diff --git a/lib/tapisui-api/package-lock.json b/lib/tapisui-api/package-lock.json