mirror of
				https://github.com/crater-invoice/crater.git
				synced 2025-11-04 06:23:17 -05:00 
			
		
		
		
	fix conflicts
This commit is contained in:
		@ -142,6 +142,7 @@
 | 
			
		||||
            color: #595959;
 | 
			
		||||
            padding: 0px;
 | 
			
		||||
            margin: 0px;
 | 
			
		||||
            width: 170px;
 | 
			
		||||
        }
 | 
			
		||||
        .bill-user-phone {
 | 
			
		||||
            font-style: normal;
 | 
			
		||||
@ -190,6 +191,7 @@
 | 
			
		||||
            color: #595959;
 | 
			
		||||
            padding: 0px;
 | 
			
		||||
            margin: 0px;
 | 
			
		||||
            width: 170px;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        .ship-user-phone {
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user