feat: rebase for conflict

aws-amplify · Sep 3, 2021 · a079e01 · a079e01
1 parent 296630f
commit a079e01
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/packages/amplify-cli-core/src/state-manager/stateManager.ts b/packages/amplify-cli-core/src/state-manager/stateManager.ts
@@ -1,9 +1,7 @@
 import * as fs from 'fs-extra';
-import * as path from 'path';
 import _ from 'lodash';
-import Ajv from "ajv";
-import { PathConstants, PathManager, pathManager } from './pathManager';
-import { $TSMeta, $TSTeamProviderInfo, $TSAny, DeploymentSecrets, writeCFNTemplate, readCFNTemplate } from '..';
+import { pathManager } from './pathManager';
+import { $TSMeta, $TSTeamProviderInfo, $TSAny, DeploymentSecrets, HooksConfig } from '..';
 import { JSONUtilities } from '../jsonUtilities';
 import { SecretFileMode } from '../cliConstants';
 import { HydrateTags, ReadTags, Tag } from '../tags';