Merge branch 'main' of github.com:zegonix/dotfiles

2024-11-03 18:30:07 +01:00
parent a5d4d98b81 ad9023961d
commit 883d74ca07
4 changed files with 10 additions and 4 deletions
--- a/alacritty/.config/alacritty/alacritty.toml
+++ b/alacritty/.config/alacritty/alacritty.toml
@@ -1,3 +1,7 @@
+<<<<<<< HEAD
+=======
+# import = ["~/.config/alacritty/themes/summer.toml"]
+>>>>>>> ad9023961deaa970bef4341893ea13935999c6fe

 [window]
 padding = { x = 2, y = 0 }