From 514522d6c1d9f7721891653e9480f0af34a14b16 Mon Sep 17 00:00:00 2001
From: Florestan Bredow <bredow@florestan.cdrflorac.fr>
Date: Thu, 20 Jun 2024 11:35:50 +0200
Subject: [PATCH] Fix typo

---
 .config/sway/config | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/.config/sway/config b/.config/sway/config
index f3a4def..8d182fb 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -98,9 +98,6 @@ bar {
 exec blueman-applet
 exec nm-applet --indicator
 exec rocketchat-desktop --start-hidden
-<<<<<<< HEAD
-exec sleep 10s; nextcloud --background
-=======
-exec sleep 10s; keepassxc
+exec sleep 10s
 exec nextcloud --background
->>>>>>> 7300811 (add keepassw to start and add timer for nextcloud)
+exec keepassxc