Porównaj commity

...

2 commits

Autor SHA1 Wiadomość Data
534e0b728e l 2023-03-22 10:53:51 +01:00
3ebfd8ba95 l 2023-03-22 10:52:45 +01:00
2 zmienionych plików z 4 dodań i 0 usunięć

Wyświetl plik

@ -234,10 +234,14 @@ 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
=======
<<<<<<< HEAD <<<<<<< HEAD
* *
* *
>>>>>>> 052958ee6eb4821ebbb9c903780d467d62617fd2 >>>>>>> 052958ee6eb4821ebbb9c903780d467d62617fd2
>>>>>>> 661162456a46270c315c09521ce09f85f0020150
*/ */
public double getTravelTime(double speed) { public double getTravelTime(double speed) {
double TotalTime = 0; double TotalTime = 0;