FIX merge issue in lockfile

donal

2018-06-14 70a3355d8f8be74676e07918b61813eb5f80f8fc

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
node_modules
public
.tmp
.idea
client/bower_components
dist
/server/config/local.env.js
npm-debug.log
reports
*.log
coverage
.nyc_output
test-results.xml
package-contents
package-contents.zip