fix conflict
This commit is contained in:
		
							
								
								
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							@ -108,3 +108,5 @@ ENV/
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
# mypy
 | 
					# mypy
 | 
				
			||||||
.mypy_cache/
 | 
					.mypy_cache/
 | 
				
			||||||
 | 
					*.egg-info
 | 
				
			||||||
 | 
					dist/
 | 
				
			||||||
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user