fix merge

elastic · Apr 8, 2024 · 2229366 · 2229366
1 parent 84786ac
commit 2229366
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 118 deletions.
diff --git a/internal/flavors/asset_inventory.go b/internal/flavors/asset_inventory.go
diff --git a/internal/flavors/benchmark/strategy.go b/internal/flavors/benchmark/strategy.go
@@ -43,12 +43,7 @@ func GetStrategy(cfg *config.Config, log *logp.Logger) (Strategy, error) {
  case config.CIS_AWS:
  if cfg.CloudConfig.Aws.AccountType == config.OrganizationAccount {
  return &AWSOrg{
-<<<<<<< HEAD
- IdentityProvider: awslib.IdentityProvider{},
-=======
- IAMProvider: &iam.Provider{},
  IdentityProvider: awslib.IdentityProvider{Logger: log},
->>>>>>> 6bf970af (fix panic due to missing logger of aws IdentityProvider (#2095))
  AccountProvider: awslib.AccountProvider{},
  }, nil
  }