From 3bfd2e1bfe5359aa8c05f3e002e71b4bced45ad8 Mon Sep 17 00:00:00 2001 From: soukainna Date: Fri, 19 May 2023 10:50:15 +0200 Subject: [PATCH] fix err merge --- handlers/application/vehicles-management.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/handlers/application/vehicles-management.go b/handlers/application/vehicles-management.go index b3c4632..f56c833 100644 --- a/handlers/application/vehicles-management.go +++ b/handlers/application/vehicles-management.go @@ -59,10 +59,7 @@ func (h *ApplicationHandler) VehiclesManagementOverview(w http.ResponseWriter, r } } -<<<<<<< HEAD -======= ->>>>>>> modifyVehicle sort.Sort(sorting.VehiclesByLicencePlate(vehicles)) sort.Sort(sorting.BookingsByStartdate(bookings)) h.Renderer.VehiclesManagementOverview(w, r, vehicles, vehicles_map, bookings) @@ -532,7 +529,7 @@ func (h *ApplicationHandler) UnbookingVehicle(w http.ResponseWriter, r *http.Req }, }, "Deleted": true, - "motif": r.FormValue("motif"), + "motif": r.FormValue("motif"), } datapb, err := structpb.NewStruct(data) @@ -653,4 +650,3 @@ func (h *ApplicationHandler) VehiclesFleetUpdate(w http.ResponseWriter, r *http. vehicles_types := h.config.GetStringSlice("modules.fleets.vehicle_types") h.Renderer.VehiclesFleetUpdate(w, r, resp.Vehicle.ToStorageType(), vehicles_types) } -