From 7f7a755e32a847a2f6ddd42228a23d26c8323045 Mon Sep 17 00:00:00 2001
From: Janis Hutz <development@janishutz.com>
Date: Mon, 28 Apr 2025 08:56:38 +0200
Subject: [PATCH] [Hyprland] Fix merge error

---
 config/hypr/hyprland_laptop.conf | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/config/hypr/hyprland_laptop.conf b/config/hypr/hyprland_laptop.conf
index e81613a..f07b3b6 100644
--- a/config/hypr/hyprland_laptop.conf
+++ b/config/hypr/hyprland_laptop.conf
@@ -68,12 +68,7 @@ bind = $mainMod CTRL, E, exec, hyprctl keyword monitor HDMI-A-1, 1920x1080@60, 1
 bind = $mainMod ALT, E, exec, hyprctl keyword monitor eDP-1, 2880x1800@60, 0x0, 1.5 && cpupower-gui -b && notify-send 'Set to battery optimized settings'
 bind = $mainMod ALT, P, exec, hyprctl keyword monitor eDP-1, 2880x1800@120, 0x0, 1.5 && cpupower-gui -p && notify-send 'Set to performance optimized settings'
 
-<<<<<<< HEAD:laptop/configs/hypr/hyprland.conf
-# Vivado inversion
-
-=======
 
 # ── Vivado inversion ────────────────────────────────────────────────
->>>>>>> v2:config/hypr/hyprland_laptop.conf
 windowrule = plugin:invertwindow, class:Vivado
 windowrule = tile, title:(.*)Vivado(.*)