merge conflicts
This commit is contained in:
		
							
								
								
									
										17
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										17
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							@@ -1,17 +0,0 @@
 | 
				
			|||||||
# ---> Go
 | 
					 | 
				
			||||||
# Binaries for programs and plugins
 | 
					 | 
				
			||||||
*.exe
 | 
					 | 
				
			||||||
*.exe~
 | 
					 | 
				
			||||||
*.dll
 | 
					 | 
				
			||||||
*.so
 | 
					 | 
				
			||||||
*.dylib
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
# Test binary, built with `go test -c`
 | 
					 | 
				
			||||||
*.test
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
# Output of the go coverage tool, specifically when used with LiteIDE
 | 
					 | 
				
			||||||
*.out
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
# Dependency directories (remove the comment below to include it)
 | 
					 | 
				
			||||||
# vendor/
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
		Reference in New Issue
	
	Block a user