commit 3682bf076b2e77d5e0df433c73283c18e422e0c2 parent 99e42fb0f5fa7f10433e896fc7e2a8bcb3f107fd Author: Chris Kiriakou <c@ckiri.com> Date: Wed, 15 Jul 2026 08:05:23 +0200 resolve merge conflict Diffstat:
| M | foot/dot-config/foot/foot.ini | | | 23 | ----------------------- |
1 file changed, 0 insertions(+), 23 deletions(-)
diff --git a/foot/dot-config/foot/foot.ini b/foot/dot-config/foot/foot.ini @@ -33,7 +33,6 @@ long-press-delay=400 [colors-dark] -<<<<<<< HEAD foreground=000000 background=ffffff regular0=000000 @@ -55,25 +54,3 @@ bright7=ffffff selection-foreground=000000 selection-background=d3d3d3 cursor=ffffff 000000 -======= -foreground=e0e2ea -background=14161b -regular0=07080d -regular1=ffc0b9 -regular2=b3f6c0 -regular3=fce094 -regular4=a6dbff -regular5=ffcaff -regular6=8cf8f7 -regular7=eef1f8 -bright0=4f5258 -bright1=ffc0b9 -bright2=b3f6c0 -bright3=fce094 -bright4=a6dbff -bright5=ffcaff -bright6=8cf8f7 -bright7=eef1f8 -selection-foreground=e0e2ea -selection-background=4f5258 ->>>>>>> 52e35bf (monthly update)