From d6adc2a82bd38d172be6cdbe1fe166171faab0c0 Mon Sep 17 00:00:00 2001
From: Hippolyte Chauvin <hchauvin38@outlook.fr>
Date: Sun, 16 Apr 2023 18:03:43 +0200
Subject: [PATCH] =?UTF-8?q?Ah=20d'accord=20en=20fait=20j'avais=20pas=20com?=
 =?UTF-8?q?pris=20comment=20=C3=A7a=20marche=20git?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/i3/config | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/config/i3/config b/config/i3/config
index 0e62b80..7116381 100644
--- a/config/i3/config
+++ b/config/i3/config
@@ -3,14 +3,8 @@ set $mod Mod4
 floating_modifier $mod
 set $refresh_i3status killall -SIGUSR1 i3status
 
-<<<<<<< HEAD
 # Font
-font pango:monospace 8
-=======
-# Font for window titles. Will also be used by the bar unless a different font
-# is used in the bar {} block below.
 font pango:monospace 9
->>>>>>> refs/remotes/origin/master
 
 # Modifiers
 tiling_drag modifier titlebar