| Chunk |
|---|
| Conflicting content |
|---|
static final int UPDATE_TEXT_ENTRY_MSG_ID = 15;
static final int WEBCORE_INITIALIZED_MSG_ID = 16;
static final int UPDATE_TEXTFIELD_TEXT_MSG_ID = 17;
<<<<<<< HEAD
static final int FIND_AGAIN = 18;
=======
static final int UPDATE_ZOOM_RANGE = 18;
>>>>>>> bb074ef9c27711be9148ed6b9decf8e6feb9267b
static final int MOVE_OUT_OF_PLUGIN = 19;
static final int CLEAR_TEXT_ENTRY = 20;
static final int UPDATE_TEXT_SELECTION_MSG_ID = 21; |
| Solution content |
|---|
static final int UPDATE_TEXT_ENTRY_MSG_ID = 15;
static final int WEBCORE_INITIALIZED_MSG_ID = 16;
static final int UPDATE_TEXTFIELD_TEXT_MSG_ID = 17;
static final int UPDATE_ZOOM_RANGE = 18;
static final int MOVE_OUT_OF_PLUGIN = 19;
static final int CLEAR_TEXT_ENTRY = 20;
static final int UPDATE_TEXT_SELECTION_MSG_ID = 21; |
| File |
|---|
| WebView.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Attribute |
| Chunk |
|---|
| Conflicting content |
|---|
"UPDATE_TEXT_ENTRY_MSG_ID", // = 15;
"WEBCORE_INITIALIZED_MSG_ID", // = 16;
"UPDATE_TEXTFIELD_TEXT_MSG_ID", // = 17;
<<<<<<< HEAD
"FIND_AGAIN", // = 18;
=======
"UPDATE_ZOOM_RANGE", // = 18;
>>>>>>> bb074ef9c27711be9148ed6b9decf8e6feb9267b
"MOVE_OUT_OF_PLUGIN", // = 19;
"CLEAR_TEXT_ENTRY", // = 20;
"UPDATE_TEXT_SELECTION_MSG_ID", // = 21; |
| Solution content |
|---|
"UPDATE_TEXTFIELD_TEXT_MSG_ID", // = 17;
"UPDATE_TEXT_ENTRY_MSG_ID", // = 15;
"WEBCORE_INITIALIZED_MSG_ID", // = 16;
"UPDATE_ZOOM_RANGE", // = 18;
"MOVE_OUT_OF_PLUGIN", // = 19;
"CLEAR_TEXT_ENTRY", // = 20;
"UPDATE_TEXT_SELECTION_MSG_ID", // = 21; |
| File |
|---|
| WebView.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |