chore(package): resolve merge conflict
chore(package): resolve merge conflict

runarberg/eslint-plugin-meteor,Hansoft/meteor,Hansoft/meteor,Hansoft/meteor,Hansoft/meteor,Hansoft/meteor,Hansoft/meteor,Hansoft/meteor,dferber90/eslint-plugin-meteor