fix merge conflict

ios/Runner/Helper/HMG_Geofence.swift

@@ -149,6 +149,7 @@ extension HMG_Geofence{
     }
     
     func notifyServer(forRegion:CLRegion, transition:Transition, location:CLLocation?){
+        showNotification(title: "Notifying server..." , subtitle: forRegion.identifier, message:  "")
         if let  userProfileJson = UserDefaults.standard.string(forKey: "user-profile"),
             let userProfile = dictionary(from: userProfileJson), let patientId = userProfile["PatientID"] as? String{
             

key.properties

@@ -0,0 +1,4 @@
+storePassword=HmGsa123
+keyPassword=HmGsa123
+keyAlias=key
+storeFile=DQKey.jks

lib/pages/landing/home_page.dart

@@ -359,8 +359,7 @@ class _HomePageState extends State<HomePage> {
                     ),
                   ],
                 ),
-                /* Zohaib work in progress for Offers and Packages Commented below line for merge it to master*/
-                // OffersAndPackagesWidget(OfferPackagesItemModel.dummy()),
+                OffersAndPackagesWidget(OfferPackagesItemModel.dummy()),
                 Container(
                   margin: EdgeInsets.only(left: 15, right: 15),
                   child: Row(