From 346c04150bcc282fdba582b34e46f90976932be0 Mon Sep 17 00:00:00 2001
From: Bensouda Idriss <bensoud@insa-20543>
Date: Tue, 28 Mar 2023 15:45:30 +0200
Subject: [PATCH] m

---
 .../main/java/org/insa/graphs/model/Path.java |   4 ----
 .../classes/org/insa/graphs/model/Path.class  | Bin 4724 -> 4724 bytes
 2 files changed, 4 deletions(-)

diff --git 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
index 7210561..c5d28dc 100644
--- 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
@@ -234,10 +234,6 @@ 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;
diff --git a/be-graphes-model/target/classes/org/insa/graphs/model/Path.class b/be-graphes-model/target/classes/org/insa/graphs/model/Path.class
index bde81ea836712266c13b2f39dd2a084eb767cdab..275e6e91e12e3a0c8bf222b5ef2d62fdd4501f6f 100644
GIT binary patch
delta 35
qcmeyO@<nCC1wq003``6k7-SeeGN=M+eTL7I9}1Q+GE9yTk^unmHVh2_

delta 35
qcmeyO@<nCC1wp~j3``7P7-Sf}GN=M+eTMIo9}1Q+vP_N;k^unn#tbC@