From 05b9e570000a9dfd870f25bb03cbad4623fc60cb Mon Sep 17 00:00:00 2001
From: danielclough <danielclough@gmail.com>
Date: Tue, 24 Nov 2020 01:51:54 -0800
Subject: [PATCH] add blackmored.service

---
 contrib/init/blackmored.service | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/contrib/init/blackmored.service b/contrib/init/blackmored.service
index c4c0167b4..57c331ed7 100644
--- a/contrib/init/blackmored.service
+++ b/contrib/init/blackmored.service
@@ -3,9 +3,6 @@ Description=Blackmore daemon
 After=network.target
 
 [Service]
-<<<<<<< HEAD
-ExecStart=/usr/local/bin/blackmored -daemon -conf=/var/lib/.blackmore/blackmore.conf -datadir=/var/lib/.blackmore
-=======
 ExecStart=export MALLOC_ARENA_MAX=1 && /usr/local/bin/blackmored -daemon -conf=/var/lib/.blackmore/blackmore.conf -datadir=/var/lib/.blackmore
 >>>>>>> 5fbf64be585767e86ad48dbd1dfb02141a8f23ab
 ExecStop=/usr/local/bin/blackmored stop