| Chunk |
|---|
| Conflicting content |
|---|
public class Car implements DataListener{
<<<<<<< HEAD
/**
* Car parameters used for calibration
*/
private final float SPEED_FACTOR = 1f;
=======
//4 metre na minuto damo v m/s
//brez *10 naj bi blo prou, samo tko leps zgleda
private final float SPEED_FACTOR = (4f/60f)*10;
>>>>>>> 490ce4b2475775962876a98cf395c6984068fc96
private final float TURN_FACTOR = 2;
private final float MAX_RADIUS = 20;
|
| Solution content |
|---|
public class Car implements DataListener{
/**
* Car parameters used for calibration
*/
//4 metre na minuto damo v m/s
//brez *10 naj bi blo prou, samo tko leps zgleda
private final float SPEED_FACTOR = (4f/60f)*10;
private final float TURN_FACTOR = 2;
private final float MAX_RADIUS = 20;
|
| File |
|---|
| Car.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Attribute |
| Comment |