conflect fix

Helius

2021-06-11 289b0503bc197d196997142f60b3a8ef8b70f0cc

1
2
3
4
5
{
    "editor.fontSize": 14,
    "files.autoSave": "afterDelay",
    "editor.cursorStyle": "line-thin"
}