- Register conflict with jenkins2

This commit is contained in:
Li-Wen Hsu 2016-03-12 15:41:50 +00:00
parent 18f0325b6b
commit 30d3e7116b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=410897
2 changed files with 2 additions and 2 deletions

View file

@ -15,7 +15,7 @@ COMMENT= Open-source continuous integration server
LICENSE= MIT
CONFLICTS= jenkins-[0-9]*
CONFLICTS= jenkins-[0-9]* jenkins2-[0-9]*
USE_JAVA= yes
NO_BUILD= yes

View file

@ -14,7 +14,7 @@ COMMENT= Open-source continuous integration server
LICENSE= MIT
CONFLICTS= jenkins-lts-[0-9]*
CONFLICTS= jenkins-lts-[0-9]* jenkins2-[0-9]*
USE_JAVA= yes