Resolve merge conflict with scrollbarchar

This commit is contained in:
Zachary Yedidia 2023-07-08 14:06:41 -07:00
parent ffa7f987b6
commit 5cb9d5eaaf

View File

@ -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,