Projects >> xtext >>0529bc26cc5ef50afaacee4765d1fa9e7ef59dd9

Chunk
Conflicting content 
    }
  }
  
<<<<<<< HEAD
  public JComboBox comboBox() {
    return new JComboBox();
  }
  
=======
>>>>>>> 36a41faaaa849ab1cc2b514a853f04da5184404a
  public void indent(final GridBagConstraints it) {
    Insets _insets = new Insets(it.insets.top, (it.insets.left + 40), it.insets.bottom, it.insets.right);
    it.insets = _insets;
Solution content 
    }
  }
  
  public void indent(final GridBagConstraints it) {
    Insets _insets = new Insets(it.insets.top, (it.insets.left + 40), it.insets.bottom, it.insets.right);
    it.insets = _insets;
File
IdeaWidgetFactory.java
Developer's decision
Version 2
Kind of conflict
Method declaration