mirror of
				https://github.com/walkxcode/dashboard-icons.git
				synced 2025-10-31 00:37:58 +01:00 
			
		
		
		
	fix: resolve merge conflicts
This commit is contained in:
		
				
					committed by
					
						 Bjorn Lammers
						Bjorn Lammers
					
				
			
			
				
	
			
			
			
						parent
						
							b560a099e9
						
					
				
				
					commit
					1dde587869
				
			| @@ -1 +1 @@ | ||||
| <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path fill="#fb651e" d="M0 0h48v48H0z"/><path fill="#fff" d="m22.382 27.14-8.24-15.433h3.766l4.846 9.767c.075.174.162.354.261.54.1.187.187.38.261.579.05.074.087.142.112.205.025.062.05.118.075.167.124.249.236.491.335.727.1.236.187.454.261.653.2-.423.417-.876.653-1.361s.478-.988.727-1.51l4.92-9.767h3.505l-8.313 15.62v9.954h-3.17z"/></svg> | ||||
| <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path fill="#fb651e" d="M0 0h48v48H0z"/><path fill="#fff" d="m22.382 27.14-8.24-15.433h3.766l4.846 9.767q.112.261.261.54.15.28.261.579.075.11.112.205.038.093.075.167.186.373.335.727t.261.653q.3-.634.653-1.361c.353-.727.478-.988.727-1.51l4.92-9.767h3.505l-8.313 15.62v9.954h-3.17z"/></svg> | ||||
| Before Width: | Height: | Size: 398 B After Width: | Height: | Size: 348 B | 
		Reference in New Issue
	
	Block a user