update to v1.45

Rodge0 · Rodge0 · commit 64279239fbca · 2022-03-22T17:34:35.000+08:00
diff --git a/go.mod b/go.mod
@@ -8,12 +8,8 @@ require (
 	github.com/Antonboom/nilnil v0.1.0
 	github.com/BurntSushi/toml v1.0.0
 	github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24
-<<<<<<< HEAD
-	github.com/LilithGames/samealias v1.0.3
-	github.com/OpenPeeDeeP/depguard v1.0.1
-=======
+	github.com/LilithGames/samealias v1.0.4
 	github.com/OpenPeeDeeP/depguard v1.1.0
->>>>>>> upstream/master
 	github.com/alexkohler/prealloc v1.0.0
 	github.com/ashanbrown/forbidigo v1.3.0
 	github.com/ashanbrown/makezero v1.1.1
diff --git a/go.sum b/go.sum
diff --git a/pkg/golinters/samealias.go b/pkg/golinters/samealias.go
@@ -10,7 +10,6 @@ import (
 )
 
 func NewSamealias(settings *config.SameAlias) *goanalysis.Linter {
-
 	a := samealias.NewAnalyzer()
 
 	var cfg map[string]map[string]interface{}

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ import (`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`func NewSamealias(settings config.SameAlias) goanalysis.Linter {`
`13`		`-`
`14`	`13`	`a := samealias.NewAnalyzer()`
`15`	`14`
`16`	`15`	`var cfg map[string]map[string]interface{}`