Resolve conflicts

LinXunFeng · LinXunFeng · commit 174414f8f7af · 2024-05-31T08:27:58.000+08:00
diff --git a/packages/image_picker/image_picker_android/AUTHORS b/packages/image_picker/image_picker_android/AUTHORS
@@ -65,3 +65,4 @@ Anton Borries <mail@antonborri.es>
 Alex Li <google@alexv525.com>
 Rahul Raj <64.rahulraj@gmail.com>
 André Sousa <andrelvsousa@gmail.com>
+LinXunFeng <linxunfeng@yeah.net>
diff --git a/packages/image_picker/image_picker_android/CHANGELOG.md b/packages/image_picker/image_picker_android/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.13
+
+* Update documentation to note that limit is not always supported.
+
 ## 0.8.12+2
 
 * Updates minimum supported SDK version to Flutter 3.22/Dart 3.4.
diff --git a/packages/image_picker/image_picker_android/pubspec.yaml b/packages/image_picker/image_picker_android/pubspec.yaml
@@ -2,7 +2,7 @@ name: image_picker_android
 description: Android implementation of the image_picker plugin.
 repository: https://github.com/flutter/packages/tree/main/packages/image_picker/image_picker_android
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+image_picker%22
-version: 0.8.12+2
+version: 0.8.13
 
 environment:
   sdk: ^3.4.0

-Original file line number
+Diff line change
 Alex Li <[email protected]>
 Rahul Raj <[email protected]>
 André Sousa <[email protected]>
 +LinXunFeng <[email protected]>