Merge conflicts

This commit is contained in:
Herman Schaaf
2016-06-15 18:04:36 +08:00
2 changed files with 4 additions and 3 deletions

View File

@@ -1,13 +1,13 @@
package check
// ErrCheck is the check for the go fmt command
type ErrCheck struct {
// Errcheck is the check for the errcheck command
type Errcheck struct {
Dir string
Filenames []string
}
// Name returns the name of the display name of the command
func (c ErrCheck) Name() string {
func (e Errcheck) Name() string {
return "errcheck"
}

View File

@@ -183,6 +183,7 @@ func newChecksResp(repo string, forceRefresh bool) (checksResp, error) {
check.GoLint{Dir: dir, Filenames: filenames},
check.GoCyclo{Dir: dir, Filenames: filenames},
check.License{Dir: dir, Filenames: []string{}},
check.Errcheck{Dir: dir, Filenames: filenames},
check.Misspell{Dir: dir, Filenames: filenames},
check.IneffAssign{Dir: dir, Filenames: filenames},
check.ErrCheck{Dir: dir, Filenames: filenames},