Compare commits

..

No commits in common. "98d0e9c3b882826df7d600a3795f31136ed8599e" and "052958ee6eb4821ebbb9c903780d467d62617fd2" have entirely different histories.

2 changed files with 0 additions and 4 deletions

View file

@ -229,11 +229,7 @@ public class Path {
* @return Time (in seconds) required to travel this path at the given speed (in * @return Time (in seconds) required to travel this path at the given speed (in
* kilometers-per-hour). * kilometers-per-hour).
* *
<<<<<<< HEAD
* *
=======
*
>>>>>>> 052958ee6eb4821ebbb9c903780d467d62617fd2
*/ */
public double getTravelTime(double speed) { public double getTravelTime(double speed) {
double TotalTime = 0; double TotalTime = 0;