Fix merge conflict with the latest changes

2 years ago · 6c44228311
parent e34ca030d7
commit 6c44228311
2 changed files with 8 additions and 2 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,11 @@
+# [7.4.12]
+- Update the minimum version of device_info_plus to 9.1.0
+
+# [7.4.11]
+- Add sw locale.
+
 # [7.4.10]
- Update the minimum version of device_info_plus to 9.0.3
+- Update translations.

 # [7.4.9]
 - Style recognition fixes.
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -20,7 +20,7 @@ dependencies:
  characters: ^1.3.0
  diff_match_patch: ^0.4.1
  i18n_extension: ^9.0.2
-  device_info_plus: ^9.0.3
+  device_info_plus: ^9.1.0
  platform: ^3.1.3
  pasteboard: ^0.2.0