Fix conflict

CHANGELOG.md

@@ -1,14 +1,22 @@
+# [7.4.14]
+- 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)`
+
 # [7.4.13]
 - Fixed tab editing when in readOnly mode.
 
 # [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.
 

pubspec.yaml

@@ -1,6 +1,6 @@
 name: flutter_quill
 description: A rich text editor built for the modern Android, iOS, web and desktop platforms. It is the WYSIWYG editor and a Quill component for Flutter.
-version: 7.4.13
+version: 7.4.14
 homepage: https://1o24bbs.com/c/bulletjournal/108
 repository: https://github.com/singerdmx/flutter-quill