Resolve conflict

This commit is contained in:
alstr
2021-11-04 12:40:42 +00:00

View File

@@ -468,5 +468,21 @@
}
}
]
},
{
"language": "Vue",
"markers": [
{
"type": "block",
"pattern": {
"start": "<!--",
"end": "-->"
}
},
{
"type": "line",
"pattern": "//"
}
]
}
]