fix conflicts

aphralG · aphralG · commit 3c6224ae163a · 2025-02-06T17:18:25.000Z
diff --git a/internal/config/config_test.go b/internal/config/config_test.go
@@ -40,7 +40,6 @@ func TestRegisterConfigFile(t *testing.T) {
 }
 
 func TestResolveConfig(t *testing.T) {
-
 	viperInstance = viper.NewWithOptions(viper.KeyDelimiter(KeyDelimiter))
 	err := loadPropertiesFromFile("./testdata/nginx-agent.conf")
 	require.NoError(t, err)

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,6 @@ func TestRegisterConfigFile(t *testing.T) {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`func TestResolveConfig(t *testing.T) {`
`43`		`-`
`44`	`43`	`viperInstance = viper.NewWithOptions(viper.KeyDelimiter(KeyDelimiter))`
`45`	`44`	`err := loadPropertiesFromFile("./testdata/nginx-agent.conf")`
`46`	`45`	`require.NoError(t, err)`