Skip to content

Commit

Permalink
Update application_mobility.go
Browse files Browse the repository at this point in the history
Resolve merge conflict errors
  • Loading branch information
kumarkgosa authored Aug 10, 2023
1 parent 3b71970 commit db86c36
Showing 1 changed file with 0 additions and 9 deletions.
9 changes: 0 additions & 9 deletions pkg/modules/application_mobility.go
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,6 @@ func AppMobilityVelero(ctx context.Context, isDeleting bool, op utils.OperatorCo

var useSnap bool
var cleanUp bool
credName := ""
var restic bool
credName := ""
veleroNS := ""
Expand Down Expand Up @@ -489,14 +488,6 @@ func AppMobilityVelero(ctx context.Context, isDeleting bool, op utils.OperatorCo
}
}

if useSnap {
yamlString2, err := getUseVolumeSnapshot(op, cr)

if err != nil {
return fmt.Errorf("unable to deploy velero-secret for Application Mobility: %v", err)
}
}

if useSnap {
yamlString2, err := getUseVolumeSnapshot(op, cr)
if err != nil {
Expand Down

0 comments on commit db86c36

Please sign in to comment.