| Chunk |
|---|
| Conflicting content |
|---|
public enum DeviceType {
ISENSE("isense", "isense39", "isense48"),
<<<<<<< HEAD
TELOSB("telosb","tmote sky","MTM-CM5000MSP"),
=======
TELOSB("telosb","MTM-CM5000MSP"),
>>>>>>> 61d07bef4ba8f0a57293618a83005d9fcfb33bd1
PACEMATE("pacemate"),
MOCK("mock"),
TRISOS("trisos"); |
| Solution content |
|---|
public enum DeviceType {
ISENSE("isense", "isense39", "isense48"),
TELOSB("telosb", "tmote sky", "MTM-CM5000MSP"),
PACEMATE("pacemate"),
MOCK("mock"),
TRISOS("trisos"); |
| File |
|---|
| DeviceType.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Enum value |