From d03ce6d24c1ba16f5615b6a168c07e3964b54dec Mon Sep 17 00:00:00 2001
From: buanet <info@buanet.de>
Date: Thu, 24 Jan 2019 15:56:57 +0100
Subject: [PATCH] fix

---
 scripts/avahi_startup.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/avahi_startup.sh b/scripts/avahi_startup.sh
index 75d9266..d186e3b 100644
--- a/scripts/avahi_startup.sh
+++ b/scripts/avahi_startup.sh
@@ -1,10 +1,15 @@
 #!/bin/sh
 
+<<<<<<< refs/remotes/origin/master
 if [ -f /var/run/dbus/pid ];
 then
   rm -f /var/run/dbus/pid
 fi
 
+=======
+echo 'Preparing...'
+rm /var/run/dbus/pid
+>>>>>>> fix
 dbus-daemon --system
 
 echo 'Restarting...'