From 91d99065845af77082d2765e876f1f914be6b2c7 Mon Sep 17 00:00:00 2001
From: Cheryl <xinyuezhang0402@gmail.com>
Date: Tue, 17 Oct 2023 11:18:28 -0700
Subject: [PATCH] Update CHANGELOG.md to fix conflict

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad735b09..a8bebfcc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,8 +3,11 @@
 
 # [7.4.12]
 - Update the minimum version of device_info_plus to 9.1.0.
+<<<<<<< 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)
 - 
 # [7.4.11]
 - Add sw locale.