Commit 79d99bbd authored by Zakaria Guennoune's avatar Zakaria Guennoune
Browse files

hotfixing conflict

parent f3fb5e44
......@@ -97,11 +97,8 @@ try {
if ((env.BUILD == 'RELEASE') || (env.BUILD == 'QA')) {
stage('Delivery') {
node("C++") {
<<<<<<< HEAD
unstash 'el7-rpms'
unstash 'el8-rpms'
=======
>>>>>>> 1703b5e... enh(ci) : New packaging workflow (#58)
sh 'setup_centreon_build.sh'
sh "./centreon-build/jobs/clib/${serie}/mon-clib-delivery.sh"
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment