Update

anstadnik · May 24, 2024 · 3eff62f · 3eff62f
1 parent e10f98c
commit 3eff62f
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/app/pubspec.lock b/app/pubspec.lock
@@ -111,17 +111,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_rust_bridge
-<<<<<<< english
-      sha256: d65dbdd271de6050d3204bab69a8ae25a291deb359403cd4f95a86055cab66c3
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.0-dev.32"
-=======
       sha256: "915d48099928282c80f7f13ad7b9bbf5808bd3c2a1ec3dc76a749aefde3025ae"
       url: "https://pub.dev"
     source: hosted
     version: "2.0.0-dev.35"
->>>>>>> dev
   flutter_test:
     dependency: "direct dev"
     description: flutter