diff --git a/.gitignore b/.gitignore index c78ae0a9..d172d6d3 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ # Unignore all with extensions !*.* !**/Dockerfile +!**/Makefile # Unignore all dirs !*/ @@ -12,7 +13,6 @@ .idea **/.DS_Store **/logs -!Makefile # gitlab ci .cache diff --git a/core/conf/config_test.go b/core/conf/config_test.go index cf1c02db..88c4785a 100644 --- a/core/conf/config_test.go +++ b/core/conf/config_test.go @@ -33,7 +33,7 @@ func TestConfigJson(t *testing.T) { var val struct { A string `json:"a"` B int `json:"b"` - C string `json:"c"` + C string `json:"c"` } MustLoad(tmpfile, &val) assert.Equal(t, "foo", val.A)