From 57fabffbbaa7ec06ae7681fcc5193a350a38dde1 Mon Sep 17 00:00:00 2001
From: quak <jonas.s97@gmx.ch>
Date: Tue, 5 Nov 2024 23:08:53 +0100
Subject: [PATCH] ..

---
 alacritty/.config/alacritty/alacritty.toml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/alacritty/.config/alacritty/alacritty.toml b/alacritty/.config/alacritty/alacritty.toml
index b0dca72..b50c886 100644
--- a/alacritty/.config/alacritty/alacritty.toml
+++ b/alacritty/.config/alacritty/alacritty.toml
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-=======
-# import = ["~/.config/alacritty/themes/summer.toml"]
->>>>>>> ad9023961deaa970bef4341893ea13935999c6fe
 
 [window]
 padding = { x = 2, y = 0 }