Skip to content

Commit

Permalink
Merge pull request #1691 from influxdata/fix/resolve-package-lock-con…
Browse files Browse the repository at this point in the history 
…flict

Resolve package-lock.json conflicts
  • Loading branch information
@bthesorceror
bthesorceror authored Dec 4, 2018
2 parents 01a4afa + 5a33035 commit 0dc099d
Showing 1 changed file with 68 additions and 68 deletions.
Loading

0 comments on commit 0dc099d

Please sign in to comment.