be-graphes-model/src/main/java/org/insa/graphs/model/Path.java

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