Branch: refs/heads/merge-conflict
Home: https://github.com/jenkinsci/jenkins
Commit: c0d96c719c816411265e5366b29064aee6301934
https://github.com/jenkinsci/jenkins/commit/c0d96c719c816411265e5366b29064aee6301934
Author: Tim Jacomb <[email protected]>
Date: 2021-02-16 (Tue, 16 Feb 2021)
Changed paths:
M core/src/main/java/jenkins/install/InstallState.java
Log Message:
-----------
Fix merge conflict resoluton for upgrade Jenkins
--
You received this message because you are subscribed to the Google Groups
"Jenkins Commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/jenkinsci-commits/jenkinsci/jenkins/push/refs/heads/merge-conflict/000000-c0d96c%40github.com.
