%!s(int64=3) %!d(string=hai) anos · 8b5a4bf828
--- a/resources/views/app/practice-management/remote-monitoring-row-markup-for-admin.blade.php
+++ b/resources/views/app/practice-management/remote-monitoring-row-markup-for-admin.blade.php
@@ -127,9 +127,6 @@
 
				             </span>
			
 
				         @endif
			
 
				     </td>
			
 
				-<<<<<<< HEAD
			
 
				-</tr>
			
 
				-=======
			
 
				     <td>
			
 
				         <?php
			
 
				         $codeStatus = 'No';
			
@@ -185,4 +182,3 @@
 
				         @endif
			
 
				     </td>
			
 
				 </tr>
			
 
				->>>>>>> 2db8d142c20046dda66df0bffc1d2b185a8e99d0