resolve conflicts

bing.ma · bing.ma · commit 8278b556cb70 · 2025-07-21T14:03:05.000+08:00
diff --git a/pkg/controllers/gameserver/gameserver_manager.go b/pkg/controllers/gameserver/gameserver_manager.go
@@ -34,7 +34,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	kruisePub "github.com/openkruise/kruise-api/apps/pub"
-
 	gameKruiseV1alpha1 "github.com/openkruise/kruise-game/apis/v1alpha1"
 	"github.com/openkruise/kruise-game/cloudprovider/utils"
 	"github.com/openkruise/kruise-game/pkg/util"
diff --git a/pkg/controllers/gameserver/gameserver_manager_test.go b/pkg/controllers/gameserver/gameserver_manager_test.go
@@ -18,7 +18,6 @@ import (
 
 	kruiseV1alpha1 "github.com/openkruise/kruise-api/apps/v1alpha1"
 	kruiseV1beta1 "github.com/openkruise/kruise-api/apps/v1beta1"
-
 	gameKruiseV1alpha1 "github.com/openkruise/kruise-game/apis/v1alpha1"
 	"github.com/openkruise/kruise-game/pkg/util"
 )

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@ import (`
`18`	`18`
`19`	`19`	`kruiseV1alpha1 "github.com/openkruise/kruise-api/apps/v1alpha1"`
`20`	`20`	`kruiseV1beta1 "github.com/openkruise/kruise-api/apps/v1beta1"`
`21`		`-`
`22`	`21`	`gameKruiseV1alpha1 "github.com/openkruise/kruise-game/apis/v1alpha1"`
`23`	`22`	`"github.com/openkruise/kruise-game/pkg/util"`
`24`	`23`	`)`