From 3ebfd8ba95ca40f452f447f6096b97293842b412 Mon Sep 17 00:00:00 2001 From: Bafo Date: Wed, 22 Mar 2023 10:52:45 +0100 Subject: [PATCH] l --- .../main/java/org/insa/graphs/model/Path.java | 6 +----- .../classes/org/insa/graphs/model/Path.class | Bin 4624 -> 4624 bytes 2 files changed, 1 insertion(+), 5 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 d62caca..ea878b2 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 @@ -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; 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 b9fc402b3dca5631a548cdd65db8eaea285384b6..56c63c6b21e1ce2399f8c2afc74a561bec9e1f65 100644 GIT binary patch delta 60 zcmbQBGC^fSj-cRc1}26#3^ELF8B~F^KEwOTwSuK`41XBp85kIN7#M*h6GJ>hFpy?s JSP14V0s!8a42}Q* delta 60 zcmbQBGC^fSj-cRs1}26N3^EKK8B~F^KEvn9wSuK`j0_C&3=9lB3_u1@K|Dh+kY;39 I2<9yU0L7XMrvLx|