Rebase

Signed-off-by: Alina Buzachis <[email protected]>
ansible-collections · Oct 24, 2024 · e5eba5c · e5eba5c
1 parent cba3a9f
commit e5eba5c
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/meta/runtime.yml b/meta/runtime.yml
@@ -114,8 +114,6 @@ action_groups:
     - ec2_transit_gateway_info
     - ec2_transit_gateway_vpc_attachment
     - ec2_transit_gateway_vpc_attachment_info
-    - ec2_vpc_nacl
-    - ec2_vpc_nacl_info
     - ec2_vpc_peer
     - ec2_vpc_peering_info
     - ec2_vpc_vgw
@@ -519,20 +517,12 @@ plugin_routing:
       redirect: amazon.aws.s3_bucket_info
     sts_assume_role:
       redirect: amazon.aws.sts_assume_role
-<<<<<<< HEAD
     ec2_vpc_egress_igw:
       redirect: amazon.aws.ec2_vpc_egress_igw
-=======
-<<<<<<< HEAD
->>>>>>> 6bd86dac (DNM - Migrate modules ec2_vpc_egress_igw and tests (#2169))
     ec2_vpc_nacl:
       redirect: amazon.aws.ec2_vpc_nacl
     ec2_vpc_nacl_info:
       redirect: amazon.aws.ec2_vpc_nacl_info
-=======
-    ec2_vpc_egress_igw:
-      redirect: amazon.aws.ec2_vpc_egress_igw
->>>>>>> a079e4ee (DNM - Migrate modules ec2_vpc_egress_igw and tests (#2169))
   module_utils:
     route53:
       redirect: amazon.aws.route53