package-lock.json   -diff -merge
package-lock.json    linguist-generated=true
* text 		 eol=lf
