CPS-378: Fix conflict

civicrm · Mar 30, 2021 · 2923420 · 2923420
1 parent fabf2c3
commit 2923420
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/package-lock.json b/package-lock.json