merge conflicts

This commit is contained in:
ycc 2021-10-28 10:58:48 +02:00
parent a06f61b8b7
commit 2c42960b93

17
.gitignore vendored
View File

@ -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/