Merge remote-tracking branch 'origin/dev' into dev

Hayao0819 · Hayao0819 · commit 4b41f4d3eafb · 2020-08-08T15:41:09.000+09:00
diff --git a/channels/i3/airootfs.any/etc/skel/.config/conky/conky-live.conf b/channels/i3/airootfs.any/etc/skel/.config/conky/conky-live.conf
@@ -34,7 +34,7 @@ conky.config = {
     cpu_avg_samples = 2,
     use_xft = true,
 }
-AからBを取り除く
+
 conky.text = [[
 ${color0}Open terminal      ${color1} : ${color2}mod+Enter
 ${color0}Kill active window ${color1} : ${color2}mod+Shift+Q

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ conky.config = {`
`34`	`34`	`cpu_avg_samples = 2,`
`35`	`35`	`use_xft = true,`
`36`	`36`	`}`
`37`		`-AからBを取り除く`
	`37`	`+`
`38`	`38`	`conky.text = [[`
`39`	`39`	`${color0}Open terminal ${color1} : ${color2}mod+Enter`
`40`	`40`	`${color0}Kill active window ${color1} : ${color2}mod+Shift+Q`