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