Explorar el Código

removed conflict markers

= hace 3 años
padre
commit
2db8d142c2
Se han modificado 1 ficheros con 0 adiciones y 10 borrados
  1. 0 10
      resources/views/app/patient/primary-coverage-view.blade.php

+ 0 - 10
resources/views/app/patient/primary-coverage-view.blade.php

@@ -111,22 +111,12 @@
 								<td>Medicare Number</td>
 								<td class="text-uppercase">{{$cpc->mcr_number ?? '-'}}</td>
 							</tr>
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-=======
-=======
->>>>>>> c326bea103e55df389135e900a66c81118703d80
 							
 							<tr>
 								<td>Created At</td>
 								<td class="text-uppercase">{{friendly_date_time($cpc->created_at)}}</td>
 							</tr>
-<<<<<<< HEAD
->>>>>>> 1e891561ad2d6c635fc985b390d5a03298f8111e
-=======
 
->>>>>>> c326bea103e55df389135e900a66c81118703d80
 						</tbody>
 					</table>
 				</div>