mirror of
https://github.com/zyedidia/micro.git
synced 2026-03-30 06:37:14 +09:00
Resolve merge conflict with scrollbarchar
This commit is contained in:
@@ -353,12 +353,10 @@ var DefaultGlobalOnlySettings = map[string]interface{}{
|
|||||||
"multiopen": "tab",
|
"multiopen": "tab",
|
||||||
"parsecursor": false,
|
"parsecursor": false,
|
||||||
"paste": false,
|
"paste": false,
|
||||||
"savehistory": true,
|
|
||||||
"scrollbarchar": "|",
|
|
||||||
"sucmd": "sudo",
|
|
||||||
"pluginchannels": []string{"https://raw.githubusercontent.com/micro-editor/plugin-channel/master/channel.json"},
|
"pluginchannels": []string{"https://raw.githubusercontent.com/micro-editor/plugin-channel/master/channel.json"},
|
||||||
"pluginrepos": []string{},
|
"pluginrepos": []string{},
|
||||||
"savehistory": true,
|
"savehistory": true,
|
||||||
|
"scrollbarchar": "|",
|
||||||
"sucmd": "sudo",
|
"sucmd": "sudo",
|
||||||
"tabhighlight": false,
|
"tabhighlight": false,
|
||||||
"tabreverse": true,
|
"tabreverse": true,
|
||||||
|
|||||||
Reference in New Issue
Block a user