Commit f4fa35da authored by Zakaria Guennoune's avatar Zakaria Guennoune
Browse files

resolve conflict

parent ce0bfb95
/*
** Variables.
*/
<<<<<<< HEAD
def serie = '21.04'
=======
properties([buildDiscarder(logRotator(numToKeepStr: '10'))])
def serie = '21.10'
>>>>>>> 192b7a4 (fix(ci) Using right sonarqube instance to analyse code (#30))
def maintenanceBranch = "${serie}.x"
if (env.BRANCH_NAME.startsWith('release-')) {
env.BUILD = 'RELEASE'
......
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