merge: fixing merge conflicts

Signed-off-by: Althaf M althafm@outlook.com Signed-off-by: Althaf M <althafm@outlook.com>
8 months ago · 88f7dc5329
parent 57d85993cb
commit 88f7dc5329
2 changed files with 6 additions and 4 deletions
--- a/pkg/chart/loader/load.go
+++ b/pkg/chart/loader/load.go
@ -19,13 +19,14 @@ package loader
 import (
 	"bytes"
 	"encoding/json"
-	"github.com/pkg/errors"
 	"log"
 	"os"
 	"path/filepath"
-	"sigs.k8s.io/yaml"
 	"strings"

+	"github.com/pkg/errors"
+	"sigs.k8s.io/yaml"
+
 	"helm.sh/helm/v4/pkg/chart"
 )

--- a/pkg/chartutil/values.go
+++ b/pkg/chartutil/values.go
@ -19,12 +19,13 @@ package chartutil
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/pkg/errors"
 	"io"
 	"os"
-	"sigs.k8s.io/yaml"
 	"strings"

+	"github.com/pkg/errors"
+	"sigs.k8s.io/yaml"
+
 	"helm.sh/helm/v4/pkg/chart"
 )