From da3a883d00a43e731ce9ce934c0b60c5b5686193 Mon Sep 17 00:00:00 2001
From: chlorospingus <paul@sayson.com>
Date: Mon, 13 Oct 2025 19:02:45 -0700
Subject: [PATCH] idek atp

---
 hypr/monitors.conf | 4 ----
 kitty/kitty.conf   | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/hypr/monitors.conf b/hypr/monitors.conf
index c2ba6ec..af7b82f 100644
--- a/hypr/monitors.conf
+++ b/hypr/monitors.conf
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-# Generated by nwg-displays on 2025-09-21 at 11:46:40. Do not edit manually.
-=======
 # Generated by nwg-displays on 2025-10-10 at 11:48:17. Do not edit manually.
->>>>>>> bc1e256 (idek atp)
 
 monitor=DP-1,2560x1440@143.97,0x0,1.0
diff --git a/kitty/kitty.conf b/kitty/kitty.conf
index a30c874..60d34e0 100644
--- a/kitty/kitty.conf
+++ b/kitty/kitty.conf
@@ -3,11 +3,7 @@ include colors.conf
 background_opacity				0
 
 font_family						ComicShannsMono Nerd Font
-<<<<<<< HEAD
-font_size						18
-=======
 font_size						14
->>>>>>> bc1e256 (idek atp)
 
 cursor							#cdf
 cursor_trail 					1