From 85c2bda4ea2c4188f3ab2812bc1e9451de10d378 Mon Sep 17 00:00:00 2001
From: redDwarf03 <sylvain@archethic.net>
Date: Mon, 15 Jul 2024 17:02:40 +0200
Subject: [PATCH] fix rebase

---
 pubspec.lock | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pubspec.lock b/pubspec.lock
index bc0074ec..c6a7d49e 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -37,6 +37,7 @@ packages:
     dependency: "direct main"
     description:
       name: archethic_dapp_framework_flutter
+<<<<<<< HEAD
 <<<<<<< HEAD
       sha256: bba3f504d6488895cdfd1c132d9e95d4f6df828a6d64c390da6f575803d510b9
       url: "https://pub.dev"
@@ -49,16 +50,22 @@ packages:
     source: hosted
     version: "1.1.24"
 =======
+=======
+>>>>>>> 4485ef5 (fix rebase)
       sha256: bba3f504d6488895cdfd1c132d9e95d4f6df828a6d64c390da6f575803d510b9
       url: "https://pub.dev"
     source: hosted
     version: "1.2.6"
+<<<<<<< HEAD
 >>>>>>> f92e81b (feat: :sparkles: Replace local history with on chain history)
 >>>>>>> 302521d (feat: :sparkles: Replace local history with on chain history)
+=======
+>>>>>>> 4485ef5 (fix rebase)
   archethic_lib_dart:
     dependency: transitive
     description:
       name: archethic_lib_dart
+<<<<<<< HEAD
 <<<<<<< HEAD
       sha256: "421f3ffe4b2f3816424fbb81ef572344a46a67590e4a237cc6251f8101582335"
       url: "https://pub.dev"
@@ -77,6 +84,12 @@ packages:
     version: "3.4.0"
 >>>>>>> f92e81b (feat: :sparkles: Replace local history with on chain history)
 >>>>>>> 302521d (feat: :sparkles: Replace local history with on chain history)
+=======
+      sha256: "421f3ffe4b2f3816424fbb81ef572344a46a67590e4a237cc6251f8101582335"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.4.1"
+>>>>>>> 4485ef5 (fix rebase)
   archethic_wallet_client:
     dependency: "direct main"
     description: