マージコンフリクト？？

backend/app/Http/Controllers/Api/MeetingApprovalsController.php

@@ -33,11 +33,11 @@ class MeetingApprovalsController extends Controller {
 
                 $cnt = MeetingApprovals::select('id')->whereNotNull('approval_at')->where('meeting_id', (int)$l->id)->count();
                 $apr = count($apr);
-    
+
                 if ($apr != 0 && $apr == $cnt) {
                     continue;
                 }
-    
+
                 $count++;
             }
         }
@@ -96,19 +96,19 @@ class MeetingApprovalsController extends Controller {
 
     public function registerApproval (Request $r) {
         if (!isset($r->meeting_id) || !isset(session()->get('children')['id'])) {
-            return ['status_code' => 400, 'error_messages' => ['承認に失敗しました。']];
+            return ['status_code' => 400, 'error_messages' => ['承知に失敗しました。']];
         }
 
         if (null === (MeetingApprovals::where('meeting_id', (int)$r->meeting_id)->where('child_id', (int)session()->get('children')['id'])->first())) {
-            return ['status_code' => 400, 'error_messages' => ['承認に失敗しました。']];
+            return ['status_code' => 400, 'error_messages' => ['承知に失敗しました。']];
         }
 
         if (null === ($meet = Meeting::where('id', (int)$r->meeting_id)->first())) {
-            return ['status_code' => 400, 'error_messages' => ['承認に失敗しました。']];
+            return ['status_code' => 400, 'error_messages' => ['承知に失敗しました。']];
         }
 
         if (null === ($father = Father::where('id', (int)$meet->father_id)->first())) {
-            return ['status_code' => 400, 'error_messages' => ['承認に失敗しました。']];
+            return ['status_code' => 400, 'error_messages' => ['承知に失敗しました。']];
         }
 
         // $update = ['approval_at' => null];
@@ -120,22 +120,22 @@ class MeetingApprovalsController extends Controller {
         } catch (\Throwable $e) {
             // 失敗
             Log::critical($e->getMessage());
-            return ['status_code' => 400, 'error_messages' => ['承認に失敗しました。']];
+            return ['status_code' => 400, 'error_messages' => ['承知に失敗しました。']];
         }
 
-        return ['status_code' => 200, 'success_messages' => ['承認しました。']];
+        return ['status_code' => 200, 'success_messages' => ['承知しました。']];
     }
 
     public function listChildrenOfMeeting (Request $r) {
         if (!isset($r->meeting_id) || !isset($r->child_id)) {
-            return ['status_code' => 400, 'error_messages' => ['承認に失敗しました。']];
+            return ['status_code' => 400, 'error_messages' => ['承知に失敗しました。']];
         }
 
         $meeting_approvals_select = ['id', 'child_id', 'approval_at'];
         $update = ['hire_at' => date('Y-m-d H:i:s', strtotime($r->hire_at))];
 
         if (null === ($params = MeetingApprovals::select($meeting_approvals_select)->where('meeting_id', (int)$r->meeting_id)->where('child_id', (int)$r->child_id)->get())) {
-            return ['status_code' => 400, 'error_messages' => ['承認に失敗しました。']];
+            return ['status_code' => 400, 'error_messages' => ['承知に失敗しました。']];
         }
 
         try {
@@ -146,7 +146,7 @@ class MeetingApprovalsController extends Controller {
             return ['status_code' => 400, 'error_messages' => ['登録に失敗しました。']];
         }
 
-        return ['status_code' => 200, 'success_messages' => ['承認しました。']];
+        return ['status_code' => 200, 'success_messages' => ['承知しました。']];
     }
 
     public function listChildrenOfApprovel (Request $r) {

backend/resources/js/child/meeting/detail.jsx

@@ -122,7 +122,7 @@ const ChildMeetingDetail = () => {
                             <div className="p-consent-btn">
                                 <button className="btn-default btn-yellow btn-consent btn-shadow btn-r8 btn-h42"
                                     onClick={e=>setShowConfirmMoal(true)}>
-                                    <span>承認</span>
+                                    <span>承知</span>
                                 </button>
                             </div>
                     }

backend/resources/js/parent/meeting/detail.jsx

@@ -50,7 +50,7 @@ const ParentMeetingDetail = () => {
 
     if(isAuthenticate()){
       setLoaded(false);
-  
+
       axios.get(`/api/fathers/meetings/detail/${params?.meeting_id}`, {params: { father_id: father_id}})
       .then((response) => {
         if(isMountedRef.current) return;
@@ -94,7 +94,7 @@ const ParentMeetingDetail = () => {
       axios.delete(`/api/fathers/meetings/delete/${params?.meeting_id}`)
       .then(response => {
         if(isMountedRef.current) return;
-  
+
         setNotice(response.data.notice);
         setSubmitDelete(false);
         setShowDeleteModal(false);
@@ -116,7 +116,7 @@ const ParentMeetingDetail = () => {
       formdata.append('meeting_id', meetingId);
       formdata.append('is_favorite', currentFavorite == 1 ? 0 : 1);
       axios.post('/api/fathers/meetings/registerFavorite', formdata)
-  
+
       const updatedItem = {
         ...meeting,
         is_favorite: currentFavorite == 1 ? 0 : 1,