fusion
This commit is contained in:
commit
98d0e9c3b8
2 changed files with 4 additions and 0 deletions
|
@ -229,7 +229,11 @@ 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;
|
||||||
|
|
Binary file not shown.
Loading…
Reference in a new issue