| Chunk |
|---|
| Conflicting content |
|---|
public static void main(String[] args) throws Exception {
<<<<<<< HEAD
final SerialPort serial = new SerialPort("/dev/ttyACM4", 9600);
=======
final SerialPort serial = new SerialPort("/dev/ttyACM1", 9600);
>>>>>>> d81785bef72ccac51f88dfb38d6914fc1fa335f6
serial.open();
serial.addEventListener(new SerialPortEventListener(){ |
| Solution content |
|---|
public static void main(String[] args) throws Exception {
final SerialPort serial = new SerialPort("/dev/ttyACM4", 9600);
serial.open();
serial.addEventListener(new SerialPortEventListener(){ |
| File |
|---|
| Test.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |