| Chunk |
|---|
| Conflicting content |
|---|
import hudson.util.CopyOnWriteMap; import hudson.util.Function1; import jenkins.model.Jenkins; <<<<<<< HEAD import jenkins.util.xml.XMLUtils; ======= >>>>>>> 51b8b641c50e5dcef4a3ce90a0742e75ecee8625 import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; |
| Solution content |
|---|
import hudson.util.CopyOnWriteMap; import hudson.util.Function1; import jenkins.model.Jenkins; import jenkins.util.xml.XMLUtils; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; |
| File |
|---|
| ItemGroupMixIn.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Import |