Merge branch 'master' into discord

2020-10-09 10:45:14 -04:00 · 2020-10-09 10:45:14 -04:00 · 9d33bbd675
parent 51592724c8 d8bd95c1fd
commit 9d33bbd675
2 changed files with 3 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -67,10 +67,9 @@ Temporary Items

 util/*/files
 util/*/files
-run.sh
 .idea
 logs
 util/files
-impact.ttf
 gus.sh
 rathaus.sh
+run.sh
--- a/gok.sh
+++ b/gok.sh
@ -15,7 +15,8 @@ gofmt -l $(find . -name '*.go') > $o 2>&1
 test $(wc -l $o | awk '{ print $1 }') = "0" || fail

 echo govet
-go vet ./... > $o 2>&1 || fail
+#go vet ./... > $o 2>&1
+echo disabled

 echo go test
 go test -test.timeout=60s ./... > $o 2>&1 || fail