summaryrefslogtreecommitdiff
path: root/hypr
diff options
context:
space:
mode:
authorzachir <zachir@librem.one>2026-04-29 19:26:23 -0500
committerzachir <zachir@librem.one>2026-04-29 19:26:23 -0500
commit6eadbf5826fd5a8e1c30f2555a527dd975f80b27 (patch)
tree5031685f08e5c9ca6d1209e86f7a89fb63a8007b /hypr
parent039313073754ebfefa7a69dd06850d4a90bfa13c (diff)
Fix broken merge
Diffstat (limited to 'hypr')
-rw-r--r--hypr/hyprland.conf1
1 files changed, 0 insertions, 1 deletions
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