Skip to content

Commit

Permalink
chore: merge fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
mojtaba-esk committed Sep 4, 2024
1 parent b981531 commit 6af8c7b
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions pkg/instance/storage.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,11 @@ import (
"strconv"
"strings"

"github.com/celestiaorg/knuu/pkg/k8s"
"github.com/celestiaorg/knuu/pkg/names"
"github.com/sirupsen/logrus"

"k8s.io/apimachinery/pkg/api/resource"

"github.com/celestiaorg/knuu/pkg/k8s"
"github.com/celestiaorg/knuu/pkg/names"
)

type storage struct {
Expand Down

0 comments on commit 6af8c7b

Please sign in to comment.