From 3717c679a075d6e3ccc7f33142b319991c83a548 Mon Sep 17 00:00:00 2001 From: Enzo Date: Thu, 9 Nov 2023 11:03:52 +0100 Subject: [PATCH] correctif du merge --- lib/Modele/Mds/DeviceConnectionStatus.dart | 2 +- pubspec.yaml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/Modele/Mds/DeviceConnectionStatus.dart b/lib/Modele/Mds/DeviceConnectionStatus.dart index abb9b96..8443751 100644 --- a/lib/Modele/Mds/DeviceConnectionStatus.dart +++ b/lib/Modele/Mds/DeviceConnectionStatus.dart @@ -1,6 +1,6 @@ /* enum DeviceConnectionStatus { NOT_CONNECTED, CONNECTING, CONNECTED } -/*enum DeviceConnectionStatus { NOT_CONNECTED, CONNECTING, CONNECTED } +enum DeviceConnectionStatus { NOT_CONNECTED, CONNECTING, CONNECTED } extension DeviceConnectionStatusExtenstion on DeviceConnectionStatus { String get statusName { diff --git a/pubspec.yaml b/pubspec.yaml index 0d158f2..4cb6e21 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -35,7 +35,6 @@ dependencies: file_picker: ^6.1.1 csv: ^5.1.1 fit_tool: ^1.0.5 - fl_chart: ^0.64.0 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons.