| Chunk |
|---|
| Conflicting content |
|---|
private void endKey(Key key) {
mCurrentX = key.mX - key.mGap / 2 + key.mWidth + key.mGap;
<<<<<<< HEAD
=======
if (mCurrentX > mMaxRowWidth)
mMaxRowWidth = mCurrentX;
>>>>>>> a28ec43da8fce42b32ab8a3a905cd82c73b5fec4
}
private void endKeyboard(int defaultVerticalGap) { |
| Solution content |
|---|
private void endKey(Key key) {
mCurrentX = key.mX - key.mGap / 2 + key.mWidth + key.mGap;
}
private void endKeyboard(int defaultVerticalGap) { |
| File |
|---|
| KeyboardParser.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| If statement |