Resolve Concelier/Excititor merge conflicts
This commit is contained in:
		
							
								
								
									
										14
									
								
								Mongo2Go-4.1.0/.gitignore
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										14
									
								
								Mongo2Go-4.1.0/.gitignore
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,14 @@ | ||||
| src/Mongo2Go/bin/ | ||||
| src/Mongo2GoTests/bin/ | ||||
| src/MongoDownloader/bin/ | ||||
| src/packages/ | ||||
| obj/ | ||||
| *ReSharper* | ||||
| *.suo | ||||
| *.dotCover | ||||
| *.user | ||||
| ~$* | ||||
| */StyleCop.Cache | ||||
| *.nupkg | ||||
| **/.vs | ||||
| .idea/ | ||||
		Reference in New Issue
	
	Block a user