Branch: refs/heads/issue150
  Home:   https://github.com/jenkinsci/configuration-as-code-plugin
  Commit: 478eeefcc04ef9a80ae6cca73899314d555ee587
      
https://github.com/jenkinsci/configuration-as-code-plugin/commit/478eeefcc04ef9a80ae6cca73899314d555ee587
  Author: Nicolas De Loof <nicolas.del...@gmail.com>
  Date:   2018-04-27 (Fri, 27 Apr 2018)

  Changed paths:
    M src/main/java/org/jenkinsci/plugins/casc/ConfigurationAsCode.java
    M src/main/java/org/jenkinsci/plugins/casc/ConfiguratorException.java

  Log Message:
  -----------
  merge yaml sources to detect conflicts
issue #150


-- 
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 jenkinsci-commits+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to