l

2023-03-22 10:52:45 +01:00 · 2023-03-22 10:52:45 +01:00 · 3ebfd8ba95
commit 3ebfd8ba95
parent 98d0e9c3b8
2 changed files with 1 additions and 5 deletions
--- a/be-graphes-model/src/main/java/org/insa/graphs/model/Path.java
+++ b/be-graphes-model/src/main/java/org/insa/graphs/model/Path.java
@ -229,11 +229,7 @@ public class Path {
     * @return Time (in seconds) required to travel this path at the given speed (in
     *         kilometers-per-hour).
     * 
-<<<<<<< HEAD
-     * 
-=======
-     *
->>>>>>> 052958ee6eb4821ebbb9c903780d467d62617fd2
+
     */
    public double getTravelTime(double speed) {
        double TotalTime = 0;
--- a/be-graphes-model/target/classes/org/insa/graphs/model/Path.class
+++ b/be-graphes-model/target/classes/org/insa/graphs/model/Path.class