Fixed conflicts
authorRemixDev <deezloaderremix@gmail.com>
Wed, 6 Mar 2019 16:38:37 +0000 (17:38 +0100)
committerRemixDev <deezloaderremix@gmail.com>
Wed, 6 Mar 2019 16:38:37 +0000 (17:38 +0100)
commit8ce93a4f5b309e88a836f687c70108edd77033e8
treeb9e54785f9c72910faefc46bc705f650ce0d6f2e
parent23d9af22f8e2b69584411f0b495c2c7c3295a6db
Fixed conflicts
app/package-lock.json
app/package.json
app/public/index.html