From dc614879bee8025953e820234a93acbaf5a41581 Mon Sep 17 00:00:00 2001
From: buanet <info@buanet.de>
Date: Mon, 28 Jan 2019 08:53:24 +0100
Subject: [PATCH] ?

---
 scripts/avahi_startup.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/scripts/avahi_startup.sh b/scripts/avahi_startup.sh
index d186e3b..00ce579 100644
--- a/scripts/avahi_startup.sh
+++ b/scripts/avahi_startup.sh
@@ -1,15 +1,12 @@
 #!/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...'