Projects >> Speedometer >>753fdcceea0a7837d01d1072806a14f06a7af098

Chunk
Conflicting content 
    } else {
      this.endTime = endTime;
    }
<<<<<<< HEAD
    if (intervalSec == 0) {
=======
    if (intervalSec <= 0) {
>>>>>>> 7faff4912cfd0cc2118cbd28d6e900a6b32532b2
      this.intervalSec = Config.DEFAULT_MEASUREMENT_INTERVAL_SEC;
    } else {
      this.intervalSec = intervalSec;
Solution content 
    } else {
      this.endTime = endTime;
    }
    if (intervalSec <= 0) {
      this.intervalSec = Config.DEFAULT_MEASUREMENT_INTERVAL_SEC;
    } else {
      this.intervalSec = intervalSec;
File
MeasurementDesc.java
Developer's decision
Version 2
Kind of conflict
If statement