| Chunk |
|---|
| Conflicting content |
|---|
@Override
public Color getForeground(boolean selected, boolean focused, boolean inactive) {
return (selected && focused) /*|| UIUtil.isUnderDarcula()*/ ? UIUtil.getListSelectionForeground()
<<<<<<< HEAD
: inactive ? UIUtil.getInactiveTextColor() : null;
=======
: inactive ? UIUtil.getInactiveTextColor() : null;
>>>>>>> 63de09f5da79fc8a528496fbb27139ad6560d3bf
}
@Override |
| Solution content |
|---|
@Override
public Color getForeground(boolean selected, boolean focused, boolean inactive) {
return (selected && focused) /*|| UIUtil.isUnderDarcula()*/ ? UIUtil.getListSelectionForeground()
: inactive ? UIUtil.getInactiveTextColor() : null;
}
@Override |
| File |
|---|
| AbstractNavBarUI.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |