From e530bcdc3ee8771fa60b48e4b947906ce9528ada Mon Sep 17 00:00:00 2001
From: Lorenzo Pagliai <lorenzo.pagliai@seco.com>
Date: Tue, 20 Dec 2022 15:16:29 +0000
Subject: [PATCH] Fix on yaml syntax
---
manifest-pipeline-yocto.yml | 3 ---
1 file changed, 3 deletions(-)
diff --git a/manifest-pipeline-yocto.yml b/manifest-pipeline-yocto.yml
index 46c34f3..c0d9690 100644
--- a/manifest-pipeline-yocto.yml
+++ b/manifest-pipeline-yocto.yml
@@ -191,10 +191,7 @@ retrigger:
if [ ${CI_PIPELINE_SOURCE} == "pipeline" ]; then
echo "This is the manifest branch used for the build ${CI_COMMIT_REF_NAME}"
BUILD_BRANCH="${CI_COMMIT_REF_NAME}"
-<<<<<<< HEAD
fi
-=======
->>>>>>> c0c25b3b80578877a4c95177a8158f4c2adf5245
- |
su secous -c "
repo init -u ${CI_REPOSITORY_URL} -b ${BUILD_BRANCH};
--
GitLab