From aa1d75de071415b6ad1032037ef0324787c0b299 Mon Sep 17 00:00:00 2001
From: Sikander Saleem <sikandersaleem.cloudsolutions@gmail.com>
Date: Tue, 29 Jul 2025 10:55:18 +0300
Subject: [PATCH] merge conflict resolved.

---
 lib/new_views/pages/land_page/land_page.dart    | 2 +-
 lib/providers/work_order/wo_frame_provider.dart | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/new_views/pages/land_page/land_page.dart b/lib/new_views/pages/land_page/land_page.dart
index fee16b45..20fe687c 100644
--- a/lib/new_views/pages/land_page/land_page.dart
+++ b/lib/new_views/pages/land_page/land_page.dart
@@ -106,7 +106,7 @@ class _LandPageState extends State<LandPage> {
       if (_userProvider!.user != null && _userProvider!.user!.employeeIsHMG == false) {
         WidgetsBinding.instance.addPostFrameCallback((_) {
           _userProvider!.getSwipeLastTransaction(userId: _userProvider!.user!.userID!);
-          Provider.of<VendorProvider>(context, listen: false).getDate();
+          Provider.of<VendorProvider>(context, listen: false).getData();
         });
       }
       _pages = <Widget>[
diff --git a/lib/providers/work_order/wo_frame_provider.dart b/lib/providers/work_order/wo_frame_provider.dart
index 2472af1a..0c92841a 100644
--- a/lib/providers/work_order/wo_frame_provider.dart
+++ b/lib/providers/work_order/wo_frame_provider.dart
@@ -9,7 +9,7 @@ import '../../models/lookup.dart';
 
 class WoFrameProvider extends LoadingListNotifier<Lookup> {
   @override
-  Future getDate() async {
+  Future getData() async {
     if (loading == true) return -2;
     loading = true;
     notifyListeners();