From 932f1086a9a66885d57c7428540fc6731af58c61 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Thu, 11 Apr 2019 01:45:06 -0400
Subject: [PATCH] plasma5.plasma-workspace: fix patch
---
pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch | 1 -
1 file changed, 1 deletion(-)
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch
index 21adba7359de..55a4518021ed 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch
+++ b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch
@@ -595,7 +595,6 @@ index 1fe41c5..11757df 100644
+wait_drkonqi=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true)
-if test x"$wait_drkonqi"x = x"true"x ; then
->>>>>>> upstream/master
+if [ x"$wait_drkonqi"x = x"true"x ]; then
# wait for remaining drkonqi instances with timeout (in seconds)
- wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`