Diff
diff --cc src/config.rs
index f644e27,a29b0db..8ee61df
--- a/src/config.rs
+++ b/src/config.rs
@@@ -9,17 -9,17 +9,30 @@@ use x11rb::protocol::xproto::KeyButMask
pub const BORDER_WIDTH: u32 = 2;
pub const BORDER_FOCUSED: u32 = 0x6dade3;
pub const BORDER_UNFOCUSED: u32 = 0xbbbbbb;
++<<<<<<< HEAD
+pub const FONT: &str = "IosevkaNerdFont:style=Bold:size=10";
++=======
+ pub const FONT: &str = "JetBrainsMono Nerd Font:style=Bold:size=12";
++>>>>>>> 303f7c23b69b0d88c8acc14ec438aca4053017bf
// ========================================
// GAPS (Vanity Gaps)
// ========================================
++<<<<<<< HEAD
+pub const GAPS_ENABLED: bool = false;
+pub const GAP_INNER_HORIZONTAL: u32 = 3;
+pub const GAP_INNER_VERTICAL: u32 = 3;
+pub const GAP_OUTER_HORIZONTAL: u32 = 3;
+pub const GAP_OUTER_VERTICAL: u32 = 3;
+//
++=======
+ pub const GAPS_ENABLED: bool = true;
+ pub const GAP_INNER_HORIZONTAL: u32 = 6;
+ pub const GAP_INNER_VERTICAL: u32 = 6;
+ pub const GAP_OUTER_HORIZONTAL: u32 = 6;
+ pub const GAP_OUTER_VERTICAL: u32 = 6;
+
++>>>>>>> 303f7c23b69b0d88c8acc14ec438aca4053017bf
// ========================================
// DEFAULTS
// ========================================