Resolve merge conflict with scrollbarchar

2026-02-24 16:00:22 +09:00 · 2023-07-08 14:06:41 -07:00
parent ffa7f987b6
commit 5cb9d5eaaf
1 changed files with 1 additions and 3 deletions
--- a/internal/config/settings.go
+++ b/internal/config/settings.go
@@ -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,