Projects >> izpack >>91805e37c2baa267ab9b7cc544f11b252a83a75d

Chunk
Conflicting content 
        processor = config.getProcessor();
        label = config.getLabel();
        description = config.getDescription();
<<<<<<< HEAD
        displayHidden = config.getDisplayHidden();
        condition = config.getCondition();
=======
        tooltip = config.getTooltip();
        this.condition = config.getCondition();
>>>>>>> 7999770c666ccba94d3429cd0b479658d566ff1b
        this.installData = installData;
Solution content 
        processor = config.getProcessor();
        label = config.getLabel();
        description = config.getDescription();
        displayHidden = config.getDisplayHidden();
        tooltip = config.getTooltip();
        this.condition = config.getCondition();
        this.installData = installData;
File
Field.java
Developer's decision
Combination
Kind of conflict
Attribute
Method invocation