wikimedia / html-metadata

MetaData html scraper and parser for Node.js (supports Promises and callback style)
MIT License
138 stars 44 forks source link

Updates packages, fix tests #69

Closed mvolz closed 6 years ago

mvolz commented 6 years ago
d00rman commented 6 years ago

@mvolz LGTM, but GH says there are conflicts. Could you rebase the patch on top of master, please?

mvolz commented 6 years ago

Does it? It says "This branch has no conflicts with the base branch" ? for me...

d00rman commented 6 years ago

@mvolz if you switch to "rebase and merge" (the preferred way), it does. This means that you simply need to git rebase origin/master locally on your branch and then git push -f

mvolz commented 6 years ago

done