[html] avoid merge conflict

2016-09-13 16:58:13 +02:00 · 2016-09-13 16:58:13 +02:00 · 537938619a
parent 6c8a859079
commit 537938619a
1 changed files with 0 additions and 1 deletions
--- a/extensions/html/package.json
+++ b/extensions/html/package.json
@ -24,7 +24,6 @@
 			"mimetypes": ["text/html", "text/x-jshtm", "text/template", "text/ng-template", "application/xhtml+xml"]
 		}],
 		"grammars": [{
-			"language": "html",
 			"scopeName": "text.html.basic",
 			"path": "./syntaxes/html.json"
 		}],