aboutsummaryrefslogtreecommitdiffstats
path: root/config/hypr/UserConfigs/Startup_Apps.conf
diff options
context:
space:
mode:
authorJa.KooLit <85185940+JaKooLit@users.noreply.github.com>2025-03-14 13:46:29 +0900
committerGitHub <noreply@github.com>2025-03-14 13:46:29 +0900
commit3b4ff3b32e2089670451dc7c48630ee045c0523d (patch)
tree9988212a63601aeb65d6b8370903f8a2d9b7d4d0 /config/hypr/UserConfigs/Startup_Apps.conf
parent4cbb9f01e139de1304f8da2ac7018ba10b800749 (diff)
parentaa1527f7349e8cf37145a0faae3fa390051562cb (diff)
Merge pull request #625 from JaKooLit/main
main to development
Diffstat (limited to 'config/hypr/UserConfigs/Startup_Apps.conf')
-rw-r--r--config/hypr/UserConfigs/Startup_Apps.conf4
1 files changed, 1 insertions, 3 deletions
diff --git a/config/hypr/UserConfigs/Startup_Apps.conf b/config/hypr/UserConfigs/Startup_Apps.conf
index a5f1027a..00b5bde2 100644
--- a/config/hypr/UserConfigs/Startup_Apps.conf
+++ b/config/hypr/UserConfigs/Startup_Apps.conf
@@ -37,9 +37,7 @@ exec-once = $UserScripts/RainbowBorders.sh
# Starting hypridle to start hyprlock
exec-once = hypridle
-<<<<<<< HEAD
-=======
->>>>>>> 98bd6af (this is ajoke)
+
# Here are list of features available but disabled by default
# exec-once = swww-daemon --format xrgb && swww img $HOME/Pictures/wallpapers/mecha-nostalgia.png # persistent wallpaper
send patches to the email below
yukais@pinapelz.com
include the subject [PATCH repo_name]
pinapelz.com
homepage