Merge pull request emberjs#233 from ember-learn/dependabot/npm_and_ya…

…rn/merge-1.2.1 [Security] Bump merge from 1.2.0 to 1.2.1
sandstrom · Dec 24, 2018 · 5e4492f · 5e4492f
2 parents f8c5439 + 7df719d
commit 5e4492f
Showing 1 changed file with 55 additions and 20 deletions.
diff --git a/package-lock.json b/package-lock.json