部分bug修复

2026-07-04 22:49:48 +08:00
parent 19979f4b31
commit 745fdaf7e7
5 changed files with 1 additions and 217 deletions
@@ -416,7 +416,6 @@ packages:
      url: "https://pub.flutter-io.cn"
    source: hosted
    version: "2.1.8"
-<<<<<<< HEAD
  pub_semver:
    dependency: transitive
    description:
@@ -433,45 +432,28 @@ packages:
      url: "https://pub.flutter-io.cn"
    source: hosted
    version: "0.6.0"
-=======
->>>>>>> c5a85e05a3bb50cd4ea7de0da2db94c867eb7ddd
  shared_preferences:
    dependency: "direct main"
    description:
      name: shared_preferences
      sha256: c3025c5534b01739267eb7d76959bbc25a6d10f6988e1c2a3036940133dd10bf
-<<<<<<< HEAD
      url: "https://pub.flutter-io.cn"
-=======
-      url: "https://pub.dev"
->>>>>>> c5a85e05a3bb50cd4ea7de0da2db94c867eb7ddd
    source: hosted
    version: "2.5.5"
  shared_preferences_android:
    dependency: transitive
    description:
      name: shared_preferences_android
-<<<<<<< HEAD
      sha256: "93ae5884a9df5d3bb696825bceb3a17590754548b5d740eba51500afc8d088f5"
      url: "https://pub.flutter-io.cn"
    source: hosted
    version: "2.4.26"
-=======
-      sha256: e8d4762b1e2e8578fc4d0fd548cebf24afd24f49719c08974df92834565e2c53
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.23"
->>>>>>> c5a85e05a3bb50cd4ea7de0da2db94c867eb7ddd
  shared_preferences_foundation:
    dependency: transitive
    description:
      name: shared_preferences_foundation
      sha256: "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f"
-<<<<<<< HEAD
      url: "https://pub.flutter-io.cn"
-=======
-      url: "https://pub.dev"
->>>>>>> c5a85e05a3bb50cd4ea7de0da2db94c867eb7ddd
    source: hosted
    version: "2.5.6"
  shared_preferences_linux:
@@ -479,11 +461,7 @@ packages:
    description:
      name: shared_preferences_linux
      sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f"
-<<<<<<< HEAD
      url: "https://pub.flutter-io.cn"
-=======
-      url: "https://pub.dev"
->>>>>>> c5a85e05a3bb50cd4ea7de0da2db94c867eb7ddd
    source: hosted
    version: "2.4.1"
  shared_preferences_platform_interface:
@@ -491,11 +469,7 @@ packages:
    description:
      name: shared_preferences_platform_interface
      sha256: "649dc798a33931919ea356c4305c2d1f81619ea6e92244070b520187b5140ef9"
-<<<<<<< HEAD
      url: "https://pub.flutter-io.cn"
-=======
-      url: "https://pub.dev"
->>>>>>> c5a85e05a3bb50cd4ea7de0da2db94c867eb7ddd
    source: hosted
    version: "2.4.2"
  shared_preferences_web:
@@ -503,11 +477,7 @@ packages:
    description:
      name: shared_preferences_web
      sha256: c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019
-<<<<<<< HEAD
      url: "https://pub.flutter-io.cn"
-=======
-      url: "https://pub.dev"
->>>>>>> c5a85e05a3bb50cd4ea7de0da2db94c867eb7ddd
    source: hosted
    version: "2.4.3"
  shared_preferences_windows:
@@ -515,11 +485,7 @@ packages:
    description:
      name: shared_preferences_windows
      sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1"
-<<<<<<< HEAD
      url: "https://pub.flutter-io.cn"
-=======
-      url: "https://pub.dev"
->>>>>>> c5a85e05a3bb50cd4ea7de0da2db94c867eb7ddd
    source: hosted
    version: "2.4.1"
  sky_engine: