From e08587a41ce6830b5f742fada91a76ddb22a4610 Mon Sep 17 00:00:00 2001
From: "aleksandr.vodianov" <aleksandr.vodianov@demlabs.net>
Date: Fri, 16 Jul 2021 11:44:06 +0300
Subject: [PATCH] fixed deploy.sh

---
 linux/debian/scripts/deploy.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/linux/debian/scripts/deploy.sh b/linux/debian/scripts/deploy.sh
index f331952..df04e9f 100755
--- a/linux/debian/scripts/deploy.sh
+++ b/linux/debian/scripts/deploy.sh
@@ -28,11 +28,7 @@ for pkgfile in $PKGFILES; do
 	CODENAME=$(echo $pkgname | rev | cut -d '-' -f1 | rev)
 	cp -r ../prod_build/general/essentials/weblink-latest ../prod_build/general/essentials/$pkgname_weblink
 	sed -i "/document/s/cellframe.*deb/$pkgname_public$MOD.deb/" ../prod_build/general/essentials/$pkgname_weblink/index.php
-<<<<<<< HEAD
 #	if [[ $(echo $CI_COMMIT_REF_NAME | grep "master\|^release\|^pubtest") != "" ]]; then
-=======
-	if [[ $(echo $CI_COMMIT_REF_NAME | grep "master\|^release\|^pubtest\|^hotfix") != "" ]]; then
->>>>>>> origin/release-4.4
 		echo "REF_NAME is $CI_COMMIT_REF_NAME"
 		ssh -i $CELLFRAME_REPO_KEY "$CELLFRAME_FILESERVER_CREDS" "mkdir -p $CELLFRAME_FILESERVER_PATH/$SUBDIR"
 		scp -i $CELLFRAME_REPO_KEY $wd/$PACKAGE_PATH/$pkgname$MOD.deb "$CELLFRAME_FILESERVER_CREDS:$CELLFRAME_FILESERVER_PATH/$SUBDIR/$pkgname_public$MOD.deb"
-- 
GitLab