From 15f2b79ee072ce507139032ba973dfd77ec9a57a Mon Sep 17 00:00:00 2001
From: Thinzar Win <thinzar.win@autoleum.com>
Date: Thu, 19 Nov 2020 14:27:29 +0630
Subject: [PATCH] resolve conflit

---
 lib/helpers/theme.dart        | 4 ++--
 lib/pages/main/home_page.dart | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/helpers/theme.dart b/lib/helpers/theme.dart
index c52f8ba..e029208 100644
--- a/lib/helpers/theme.dart
+++ b/lib/helpers/theme.dart
@@ -11,10 +11,10 @@ const buttonBkColor = const Color(0xFF268944);
 const labelColor = const Color(0xFF757575);
 
 const TextStyle labelStyle =
-    TextStyle(fontSize: 20, color: primaryColor, fontWeight: FontWeight.w500);
+    TextStyle(fontSize: 20, color: labelColor, fontWeight: FontWeight.w500);
 const TextStyle labelStyleMM = TextStyle(
     fontSize: 20,
-    color: primaryColor,
+    color: labelColor,
     fontWeight: FontWeight.w500,
     height: 1,
     fontFamily: "Myanmar3");
diff --git a/lib/pages/main/home_page.dart b/lib/pages/main/home_page.dart
index 13529e7..2bb0aa5 100644
--- a/lib/pages/main/home_page.dart
+++ b/lib/pages/main/home_page.dart
@@ -496,7 +496,8 @@ class _HomePageState extends State<HomePage> {
                       SizedBox(height: 50),
                       BottomWidgets(),
                     ],
-                  ))),
+                  ))
+                  ),
         ),
       ),
     );