fix: fixed merge conflict

NordicSemiconductor · Nov 16, 2020 · e310922 · e310922
2 parents 5eacf4f + cbb4070
commit e310922
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/package-lock.json b/package-lock.json