| Chunk |
|---|
| Conflicting content |
|---|
ANNOUNCEMENT(74, "74", "announcement", R.string.log_announcement),
MOVE_COLLECTION(69, "69", "unused_collection", R.string.log_movecollection),
MOVE_INVENTORY(70, "70", "unused_inventory", R.string.log_moveinventory),
<<<<<<< HEAD
RETRACT(25, "25", "rectract listing", R.string.log_retractlisting),
UNKNOWN(0, "unknown", "", R.string.err_unknown, R.drawable.mark_red); // LogType not init. yet
=======
RETRACT(25, "25", "retract listing", R.string.log_retractlisting),
UNKNOWN(0, "unknown", "", R.string.err_unknown); // LogType not init. yet
>>>>>>> 516204d3a42145717f3cb4249c824aa81739ec02
public final int id;
public final String iconName; |
| Solution content |
|---|
ANNOUNCEMENT(74, "74", "announcement", R.string.log_announcement),
MOVE_COLLECTION(69, "69", "unused_collection", R.string.log_movecollection),
MOVE_INVENTORY(70, "70", "unused_inventory", R.string.log_moveinventory),
RETRACT(25, "25", "retract listing", R.string.log_retractlisting),
UNKNOWN(0, "unknown", "", R.string.err_unknown, R.drawable.mark_red); // LogType not init. yet
public final int id;
public final String iconName; |
| File |
|---|
| LogType.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Comment |
| Enum value |