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;