From 3f9c89837970863fa8c7c3f1747b1ee56a300468 Mon Sep 17 00:00:00 2001
From: Ahmed Hnewa <73608287+freshtechtips@users.noreply.github.com>
Date: Thu, 19 Oct 2023 08:37:59 +0300
Subject: [PATCH] Update CHANGELOG.md

---
 CHANGELOG.md                          | 9 ---------
 flutter_quill_extensions/CHANGELOG.md | 2 ++
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8149cc9b..99fef3b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,16 +7,7 @@
 
 # [7.4.12]
 - Update the minimum version of device_info_plus to 9.1.0.
-<<<<<<< HEAD
-<<<<<<< HEAD
-- Custom style attrbuites for platforms other than mobile (alignment, margin, width, height)
-- Improve performance by reducing the number of widgets rebuilt by listening to media query for only the needed things, for example instead of using `MediaQuery.of(context).size`, now we are using `MediaQuery.sizeOf(context)`
-=======
->>>>>>> 956c56c (Update CHANGELOG.md to fix conflict)
-- 
-=======
 
->>>>>>> 14fb52b (Fix conflict)
 # [7.4.11]
 - Add sw locale.
 
diff --git a/flutter_quill_extensions/CHANGELOG.md b/flutter_quill_extensions/CHANGELOG.md
index c206e399..a6155cb5 100644
--- a/flutter_quill_extensions/CHANGELOG.md
+++ b/flutter_quill_extensions/CHANGELOG.md
@@ -8,6 +8,8 @@
 - Add QuillImageUtilities class
 - Small improvemenets
 - Allow to use the mobile context menu on desktop by force using it
+- Add the resizing option to the forced mobile context menu
+- Add new custom style attrbuite for desktop and other platforms
 
 ## 0.5.0
 - Migrated from `gallery_saver` to `gal` for saving images