| Chunk |
|---|
| Conflicting content |
|---|
//Send printed data to driverstation
driverstation.sendData();
<<<<<<< HEAD
//Read out kinect values
// kinect.updateKinect();
=======
>>>>>>> 450d79fd2187c1f91aad9d27ca7b70c9517a7975
}
/** |
| Solution content |
|---|
//Send printed data to driverstation
driverstation.sendData();
}
/** |
| File |
|---|
| RobotMain.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |