Porovnat revize
2 commitů
661162456a
...
534e0b728e
Autor | SHA1 | Datum | |
---|---|---|---|
534e0b728e | |||
3ebfd8ba95 |
2 změnil soubory, kde provedl 4 přidání a 0 odebrání
|
@ -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;
|
||||||
|
|
Binární soubor nebyl zobrazen.
Načítání…
Odkázat v novém problému