resolve merge conflicts

aws-amplify · Oct 5, 2021 · dbdc135 · dbdc135
2 parents 3225a1d + 89b4f0a
commit dbdc135
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/packages/amplify-cli-overrides-helper/src/index.ts b/packages/amplify-cli-overrides-helper/src/index.ts
@@ -1,5 +1,7 @@
 import { printer } from 'amplify-prompts';
 
+import { AmplifyRootStackTemplate } from 'amplify-provider-awscloudformation';
+
 function getProjectInfo(): void {
   printer.info('Hello from the skeleton of get project info');
 }
@@ -8,4 +10,4 @@ function addDependency(): void {
   printer.info('Hello from the skeleton of add dependency');
 }
 
-export { getProjectInfo, addDependency };
+export { getProjectInfo, addDependency, AmplifyRootStackTemplate };
diff --git a/packages/amplify-provider-awscloudformation/src/aws-utils/aws-ssm.ts b/packages/amplify-provider-awscloudformation/src/aws-utils/aws-ssm.ts
@@ -1,6 +1,7 @@
 import { $TSContext, $TSObject } from 'amplify-cli-core';
 import { AwsSecrets, loadConfiguration } from '../configuration-manager';
 import aws from './aws.js';
+import * as AWS from 'aws-sdk';
 
 export class SSM {
   private static instance: SSM;