Commit e6241d05 authored by Sai Srinivas's avatar Sai Srinivas
Browse files

Merge remote-tracking branch 'origin/main'

# Conflicts:
#	lib/Screens/BillScreens/BillDetailScreen.dart
#	lib/Screens/DashboardScreen.dart
#	lib/Screens/HelpScreens/OrderHelpScreen.dart
#	lib/Screens/ProductsDetailScreen.dart
#	lib/Screens/ProfileScreen.dart
#	lib/Screens/TransactionScreens/BillStatusToast.dart
#	lib/Screens/authScreen/LoginScreen.dart
#	lib/Screens/authScreen/OTP_Screen.dart
parents 558ac0d8 cdbe1e86
...@@ -601,4 +601,4 @@ class _HelpTicketScreenState extends State<HelpTicketScreen> { ...@@ -601,4 +601,4 @@ class _HelpTicketScreenState extends State<HelpTicketScreen> {
_otherReasonController.dispose(); _otherReasonController.dispose();
super.dispose(); super.dispose();
} }
} }
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment