From be942b094905398af13ed232d5e23bc360125afe Mon Sep 17 00:00:00 2001
From: "Jonathan \"Duke\" Leto" <jonathan@leto.net>
Date: Fri, 22 Nov 2019 22:54:28 -0800
Subject: [PATCH] fix merge conflict

---
 src/scripts/mkmacdmg.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/scripts/mkmacdmg.sh b/src/scripts/mkmacdmg.sh
index fbce40d..2e6eb86 100755
--- a/src/scripts/mkmacdmg.sh
+++ b/src/scripts/mkmacdmg.sh
@@ -106,7 +106,6 @@ echo "[OK]"
 # xcrun stapler staple macOS-zecwallet-v0.8.0.dmg
 
 echo -n "Building dmg..........."
-<<<<<<< HEAD
 mv silentdragon.app silentdragon.app
 create-dmg --volname "silentdragon-v$APP_VERSION" --volicon "res/logo.icns" --window-pos 200 120 --icon "silentdragon.app" 200 190  --app-drop-link 600 185 --hide-extension "silentdragon.app"  --window-size 800 400 --hdiutil-quiet --background res/dmgbg.png  artifacts/macOS-silentdragon-v$APP_VERSION.dmg silentdragon.app >/dev/null 2>&1