<<<<<<< HEAD * text=auto ======= * text eol=crlf *.min.js binary *.map binary >>>>>>> origin/next