# Conflicts: # .gitignore # dist/plyr.css # dist/plyr.js # dist/sprite.svg # docs/dist/docs.css # docs/dist/docs.js # docs/src/less/components/examples.less # src/js/plyr.js # src/less/plyr.less # src/sprite/icon-fast-forward.svg # src/sprite/icon-pause.svg # src/sprite/icon-play.svg # src/sprite/icon-rewind.svg