fix merge conflict

madeline-k · madeline-k · commit c7e309d6f5b7 · 2022-03-30T14:04:45.000-07:00
diff --git a/packages/@aws-cdk/aws-s3-assets/test/asset.test.ts b/packages/@aws-cdk/aws-s3-assets/test/asset.test.ts
@@ -429,7 +429,3 @@ function mkdtempSync() {
 function isStackArtifact(x: any): x is cxapi.CloudFormationStackArtifact {
   return x instanceof cxapi.CloudFormationStackArtifact;
 }
-
-function isAssetManifestArtifact(x: any): x is cxapi.AssetManifestArtifact {
-  return x instanceof cxapi.AssetManifestArtifact;
-}

Original file line number	Diff line number	Diff line change
`@@ -429,7 +429,3 @@ function mkdtempSync() {`
`429`	`429`	`function isStackArtifact(x: any): x is cxapi.CloudFormationStackArtifact {`
`430`	`430`	`return x instanceof cxapi.CloudFormationStackArtifact;`
`431`	`431`	`}`
`432`		`-`
`433`		`-function isAssetManifestArtifact(x: any): x is cxapi.AssetManifestArtifact {`
`434`		`- return x instanceof cxapi.AssetManifestArtifact;`
`435`		`-}`