fixed pro

resources/views/admin/pros_SINGLE/SUB_dashboard.blade.php

@@ -19,28 +19,13 @@
     </table>
 </div>
 
-<div class="table-responsive p-0 bg-white table-sm mb-3">
-    <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
-        <thead>
-        <tr>
-<<<<<<< HEAD
-            <th colspan="2" class="px-2">Company
-                <span class="ml-auto"><a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/pros/view/<?= $record->uid ?>/ACTION_putCompany' title='Change?optimised=1'class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Change</span></a></span>
-            </th>
-        </tr>
-        </thead>
-        <tbody>
-            <tr><td class="w-25 px-2 text-secondary border-right">Company Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->company_id ?></td></tr>
-        </tbody>
-    </table>
-</div>
+
 
 <div class="table-responsive p-0 bg-white table-sm mb-3">
     <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
         <thead>
         <tr>
-=======
->>>>>>> ec27b61d88858f4518272b9b3b5e85fbf58694fa
+
             <th colspan="2" class="px-2">Initiative
                 <span class="ml-auto"><a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/pros/view/<?= $record->uid ?>/ACTION_setInitiative' title='Change?optimised=1'class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Change</span></a></span>
             </th>

resources/views/admin/pros_SINGLE/SUB_payment_schedule.blade.php

@@ -31,9 +31,6 @@
                 <tbody>
                 @foreach($subRecords as $subRecord)
                     <tr>
-<<<<<<< HEAD
-                        <td><a href="/pro_rates/view/{{ $subRecord->uid }}"><?= $subRecord->uid ?></a></td>
-=======
                         <td><a href="/pro_rates/view/{{ $subRecord->uid }}"><i class="fas fa-share-square"></i></a></td>
 <td><?= friendly_date_time($record->created_at) ?></td>
 <td><?= $subRecord->type ?></td>
@@ -43,7 +40,6 @@
 <td><?= friendly_date_time($record->reactivated_at) ?></td>
 <td><?= $subRecord->reactivation_memo ?></td>
 <td><?= $subRecord->amount ?></td>
->>>>>>> f18f1950c1c00e1cf4b28c759c8297a5c34bbab6
 <td><?= $subRecord->code ?></td>
 <td><?= $subRecord->amount ?></td>
 <td><?= $subRecord->responsibility ?></td>