From 6c44228311e98a1691dcd49263feb42dad8a2723 Mon Sep 17 00:00:00 2001
From: Ahmed Hnewa <73608287+freshtechtips@users.noreply.github.com>
Date: Tue, 17 Oct 2023 19:18:54 +0300
Subject: [PATCH] Fix merge conflict with the latest changes

---
 CHANGELOG.md | 8 +++++++-
 pubspec.yaml | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb0798b6..a79916d0 100644
--- 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.
diff --git a/pubspec.yaml b/pubspec.yaml
index 6616e383..751d8abc 100644
--- 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