idek atp

2025-10-13 19:02:45 -07:00
parent 866037c41b
commit da3a883d00
2 changed files with 0 additions and 8 deletions
--- 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
--- 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