fix merge issues
This commit is contained in:
		
							
								
								
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							@@ -42,3 +42,5 @@ app.*.map.json
 | 
			
		||||
/android/app/debug
 | 
			
		||||
/android/app/profile
 | 
			
		||||
/android/app/release
 | 
			
		||||
 | 
			
		||||
lib/gen/meta.dart
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user