From 6eadbf5826fd5a8e1c30f2555a527dd975f80b27 Mon Sep 17 00:00:00 2001
From: zachir <zachir@librem.one>
Date: Wed, 29 Apr 2026 19:26:23 -0500
Subject: Fix broken merge

---
 hypr/hyprland.conf | 1 -
 1 file changed, 1 deletion(-)

(limited to 'hypr')

diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index 47be77b..07423c3 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -16,7 +16,6 @@ monitor = , highres highrr, auto, 1
 #{{{ Autostart
 # Execute your favorite apps at launch
 # exec-once = waybar & hyprpaper & firefox
-<<<<<<< HEAD
 exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
 # These are for systems with no systemd
 exec-once = dinitctl start hyprpaper.user
-- 
cgit v1.2.3