merge conflicts
This commit is contained in:
parent
cc4c2bfac8
commit
69c32732d5
|
@ -1,5 +1,6 @@
|
||||||
{
|
{
|
||||||
"password": "",
|
"password": "",
|
||||||
"url": "http://localhost:8000",
|
"url": "http://localhost:8000",
|
||||||
"maxcount": 50
|
"maxcount": 50,
|
||||||
|
"command": "sublime_text.exe -w"
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue