| Chunk |
|---|
| Conflicting content |
|---|
<<<<<<< HEAD
UPDATE_COORDINATES(47, "47", "update coordinates", R.string.log_update),
DISCOVERED_IT(48, "48", "discovered it", R.string.log_discovered, R.drawable.mark_green),
POST_REVIEWER_NOTE(18, "68", "post reviewer note", R.string.log_reviewer),
VISIT(1001, "1001", "visit", R.string.log_tb_visit, R.drawable.mark_green),
WEBCAM_PHOTO_TAKEN(11, "11", "webcam photo taken", R.string.log_webcam, R.drawable.mark_green),
=======
VISIT(1001, "75", "visit", R.string.log_tb_visit),
WEBCAM_PHOTO_TAKEN(11, "11", "webcam photo taken", R.string.log_webcam),
>>>>>>> 58ff855100a554c1be254012f055ed2a0dc7de39
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), |
| Solution content |
|---|
UPDATE_COORDINATES(47, "47", "update coordinates", R.string.log_update),
DISCOVERED_IT(48, "48", "discovered it", R.string.log_discovered, R.drawable.mark_green),
POST_REVIEWER_NOTE(18, "68", "post reviewer note", R.string.log_reviewer),
VISIT(1001, "75", "visit", R.string.log_tb_visit, R.drawable.mark_green),
WEBCAM_PHOTO_TAKEN(11, "11", "webcam photo taken", R.string.log_webcam, R.drawable.mark_green),
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), |
| File |
|---|
| LogType.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Enum value |