fix: resolve conflict

Signed-off-by: namkyu1999 <[email protected]>
litmuschaos · May 10, 2024 · 39120d7 · 39120d7
1 parent a20aa4f
commit 39120d7
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/chaoscenter/graphql/server/pkg/chaoshub/service.go b/chaoscenter/graphql/server/pkg/chaoshub/service.go
@@ -133,13 +133,8 @@ func (c *chaosHubService) AddRemoteChaosHub(ctx context.Context, chaosHub model.
 	if err != nil {
 		return nil, err
 	}
-<<<<<<< HEAD
 	if IsExist == true {
 		return nil, errors.New("name already exists")
-=======
-	if IsExist {
-		return nil, errors.New("Name Already exists")
->>>>>>> 53c11651443d0f41515b30237647a18ecf1c2bdf
 	}
 	description := ""
 	if chaosHub.Description != nil {
@@ -207,13 +202,8 @@ func (c *chaosHubService) SaveChaosHub(ctx context.Context, chaosHub model.Creat
 	if err != nil {
 		return nil, err
 	}
-<<<<<<< HEAD
 	if IsExist == true {
 		return nil, errors.New("name already exists")
-=======
-	if IsExist {
-		return nil, errors.New("Name Already exists")
->>>>>>> 53c11651443d0f41515b30237647a18ecf1c2bdf
 	}
 
 	// Initialize a UID for new Hub.