attempt to resolve merge conflict

Gleb Brozhe · Gleb Brozhe · commit 757f14f6064d · 2024-04-17T08:27:51.000-07:00
diff --git a/internal/stack/record.go b/internal/stack/record.go
@@ -139,7 +139,7 @@ func parseFunctionName(name string) functionDetails {
 	if len(split) > 1 {
 		details.funcName = split[len(split)-1]
 	}
-	if len(split) > 2 {
+	if len(split) > 2 { //nolint:gomnd
 		details.structName = split[1]
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ func parseFunctionName(name string) functionDetails {`
`139`	`139`	`if len(split) > 1 {`
`140`	`140`	`details.funcName = split[len(split)-1]`
`141`	`141`	`}`
`142`		`- if len(split) > 2 {`
	`142`	`+ if len(split) > 2 { //nolint:gomnd`
`143`	`143`	`details.structName = split[1]`
`144`	`144`	`}`
`145`	`145`