Commit 098c45e
committed
Merge branch 'master' of https://github.com/bgrohman/vim-javascript-syntax into bgrohman-master
Conflicts:
syntax/javascript.vim1 file changed
+1
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
287 | 287 | | |
288 | 288 | | |
289 | 289 | | |
290 | | - | |
| 290 | + | |
291 | 291 | | |
292 | 292 | | |
293 | 293 | | |
| |||
0 commit comments