From 056a2a8b74f0db56c4b3bd247d52fe6e5711cf0b Mon Sep 17 00:00:00 2001
From: tteckster <tteckster@gmail.com>
Date: Wed, 16 Mar 2022 18:08:45 -0400
Subject: [PATCH] Update dashy-update.sh

---
 misc/dashy-update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/dashy-update.sh b/misc/dashy-update.sh
index 141ac886..a2ca3e42 100644
--- a/misc/dashy-update.sh
+++ b/misc/dashy-update.sh
@@ -41,7 +41,7 @@ echo -e "${CM}${CL} \r"
 
 echo -en "${GN} Updating Dashy... "
 cd /dashy
-git stash &>/dev/null
+git merge &>/dev/null
 git pull origin master &>/dev/null
 yarn &>/dev/null
 yarn build &>/dev/null