mirror of
				https://github.com/walkxcode/dashboard-icons.git
				synced 2025-10-30 00:07:56 +01:00 
			
		
		
		
	fix: resolve merge conflicts
This commit is contained in:
		
				
					committed by
					
						 Bjorn Lammers
						Bjorn Lammers
					
				
			
			
				
	
			
			
			
						parent
						
							b560a099e9
						
					
				
				
					commit
					1dde587869
				
			
										
											Binary file not shown.
										
									
								
							| Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 36 KiB | 
		Reference in New Issue
	
	Block a user