Merge conflict fix

awslabs · Oct 19, 2023 · 82a9155 · 82a9155
1 parent 19094ca
commit 82a9155
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/.../src/main/kotlin/aws/sdk/kotlin/codegen/protocols/core/AwsHttpBindingProtocolGenerator.kt b/.../src/main/kotlin/aws/sdk/kotlin/codegen/protocols/core/AwsHttpBindingProtocolGenerator.kt
@@ -67,6 +67,9 @@ abstract class AwsHttpBindingProtocolGenerator : HttpBindingProtocolGenerator()
                 "SDKAppendsGzipAndIgnoresHttpProvidedEncoding_awsJson1_1",
                 "SDKAppendsGzipAndIgnoresHttpProvidedEncoding_awsQuery",
                 "SDKAppendsGzipAndIgnoresHttpProvidedEncoding_ec2Query",
+
+                // FIXME - missing Content-Type on restXml empty payloads, see https://github.com/awslabs/aws-sdk-kotlin/issues/1050
+                "RestXmlHttpPayloadWithUnsetUnion",
             ),
         )