mirror of
				https://github.com/adidas/api-guidelines.git
				synced 2025-10-25 15:19:19 +00:00 
			
		
		
		
	Solved conflict
This commit is contained in:
		
							
								
								
									
										3
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -106,6 +106,5 @@ dist | ||||
| # SSHFS | ||||
| ._* | ||||
|  | ||||
| _book/ | ||||
|  | ||||
| **/.DS_Store | ||||
| .DS_Store | ||||
|   | ||||
		Reference in New Issue
	
	Block a user