From 4df8409e609ac6a5cba2d2db74878d8308754686 Mon Sep 17 00:00:00 2001
From: Linksehat Staging Server <it.dev@linksehat.com>
Date: Mon, 4 Sep 2023 15:28:21 +0700
Subject: [PATCH] merge

---
 Modules/Internal/Services/MemberEnrollmentService.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/Modules/Internal/Services/MemberEnrollmentService.php b/Modules/Internal/Services/MemberEnrollmentService.php
index 104559ef..60fd8516 100644
--- a/Modules/Internal/Services/MemberEnrollmentService.php
+++ b/Modules/Internal/Services/MemberEnrollmentService.php
@@ -655,11 +655,7 @@ class MemberEnrollmentService
                     'start' => $corporate->currentPolicy->start
                 ]), 0, null, $row);
             }
-<<<<<<< HEAD
-           
-=======
             
->>>>>>> origin/staging
             if ($members_expire_date >= $corporate->currentPolicy->end && ($members_expire_date != $corporate->currentPolicy->end)) {
                 throw new ImportRowException(__('enrollment.LESS_THAN', [
                     'date_param' => 'Member Expired Date',
@@ -811,11 +807,7 @@ class MemberEnrollmentService
                         ->where('member_id', $row['member_id'])
                         ->first();
                     
-<<<<<<< HEAD
-                    // Validate If Exist Member
-=======
                     // // Validate If Exist Member
->>>>>>> origin/staging
                     if (!$member) {
                         throw new ImportRowException(__('enrollment.MEMBER_NOT_FOUND', [
                             'member_id' => $row['member_id'],