an attempt to resolve merge conflict

Gleb Brozhe · Gleb Brozhe · commit 07d827e1cfad · 2024-04-11T12:37:53.000-07:00
diff --git a/internal/decimal/decimal_test.go b/internal/decimal/decimal_test.go
@@ -246,8 +246,8 @@ func uint128(hi, lo uint64) []byte {
 func uint128s(lo uint64) []byte {
 	return uint128(0, lo)
 }
-func TestParse(t *testing.T) {
 
+func TestParse(t *testing.T) {
 	tests := []struct {
 		name      string
 		s         string
@@ -273,7 +273,6 @@ func TestParse(t *testing.T) {
 			}
 		})
 	}
-
 }
 
 func FuzzParse(f *testing.F) {
diff --git a/internal/stack/record.go b/internal/stack/record.go
@@ -99,6 +99,7 @@ func (c call) Record(opts ...recordOption) string {
 			opt(&optionsHolder)
 		}
 	}
+
 	name, file := extractName(c.function, c.file)
 	fnDetails := parseFunctionName(name)
 

Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,7 @@ func (c call) Record(opts ...recordOption) string {`
`99`	`99`	`opt(&optionsHolder)`
`100`	`100`	`}`
`101`	`101`	`}`
	`102`	`+`
`102`	`103`	`name, file := extractName(c.function, c.file)`
`103`	`104`	`fnDetails := parseFunctionName(name)`
`104`	`105`