From e735282b7d4ef0b405d6048fc2fa7ff5f0ae95a3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 21 Jul 2020 15:24:14 -0400 Subject: [PATCH] Fix mess from rebase. --- aws/resource_aws_apigatewayv2_stage_test.go | 8 -------- 1 file changed, 8 deletions(-) diff --git a/aws/resource_aws_apigatewayv2_stage_test.go b/aws/resource_aws_apigatewayv2_stage_test.go index f4051220c41e..9683c8a9fa05 100644 --- a/aws/resource_aws_apigatewayv2_stage_test.go +++ b/aws/resource_aws_apigatewayv2_stage_test.go @@ -573,10 +573,6 @@ func TestAccAWSAPIGatewayV2Stage_RouteSettingsWebSocket(t *testing.T) { tfawsresource.TestCheckTypeSetElemNestedAttrs(resourceName, "route_settings.*", map[string]string{ "data_trace_enabled": "false", "detailed_metrics_enabled": "false", -<<<<<<< HEAD -======= - "logging_level": "OFF", ->>>>>>> r/aws_apigatewayv2_stage: No need for diff-suppression for new resources. "route_key": "$default", "throttling_burst_limit": "0", "throttling_rate_limit": "0", @@ -706,10 +702,6 @@ func TestAccAWSAPIGatewayV2Stage_RouteSettingsHttp(t *testing.T) { tfawsresource.TestCheckTypeSetElemNestedAttrs(resourceName, "route_settings.*", map[string]string{ "data_trace_enabled": "false", "detailed_metrics_enabled": "true", -<<<<<<< HEAD -======= - "logging_level": "OFF", ->>>>>>> r/aws_apigatewayv2_stage: No need for diff-suppression for new resources. "route_key": "$default", "throttling_burst_limit": "2222", "throttling_rate_limit": "8888",