From 8832940a61a2d39ab96bc999087f511a8c1f6d76 Mon Sep 17 00:00:00 2001 From: Kyle Robertson Date: Tue, 31 Aug 2021 19:58:13 -0400 Subject: [PATCH] fixed rebase dumbness --- aws/provider.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/aws/provider.go b/aws/provider.go index 25ae9dc9f89..784d2902635 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -307,11 +307,8 @@ func Provider() *schema.Provider { "aws_iam_policy": dataSourceAwsIAMPolicy(), "aws_iam_policy_document": dataSourceAwsIamPolicyDocument(), "aws_iam_role": dataSourceAwsIAMRole(), -<<<<<<< HEAD "aws_iam_roles": dataSourceAwsIAMRoles(), -======= "aws_iam_saml_provider": dataSourceAwsIAMSamlProvider(), ->>>>>>> fe5e9eaa5 (updates to PR for new standards) "aws_iam_server_certificate": dataSourceAwsIAMServerCertificate(), "aws_iam_session_context": dataSourceAwsIAMSessionContext(), "aws_iam_user": dataSourceAwsIAMUser(),