aboutsummaryrefslogtreecommitdiffstats
path: root/config/hypr/lua
diff options
context:
space:
mode:
Diffstat (limited to 'config/hypr/lua')
-rw-r--r--config/hypr/lua/settings.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/hypr/lua/settings.lua b/config/hypr/lua/settings.lua
index 5cab666f..cc9fd41f 100644
--- a/config/hypr/lua/settings.lua
+++ b/config/hypr/lua/settings.lua
@@ -162,8 +162,8 @@ hl.config({
<<<<<<< HEAD
no_hardware_cursors = 0,
=======
- no_hardware_cursors = 0,
->>>>>>> eb60d6f9 (Fixed wallpaper being reset (hopefully))
+ no_hardware_cursors = 0,
+>>>>>>> 460ee670 (Upd: nwg-display for edit mon cfg in Kool_Quick_Settings)
enable_hyprcursor = true,
warp_on_change_workspace = 2,
no_warps = true,
send patches to the email below
yukais@pinapelz.com
include the subject [PATCH repo_name]
pinapelz.com
homepage