chore: fix conflicts

aws-amplify · Jun 30, 2022 · a900c11 · a900c11
2 parents 9951177 + 9ef69dc
commit a900c11
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/yarn.lock b/yarn.lock
@@ -6694,15 +6694,15 @@ [email protected]:
 
 [email protected]:
   version "1.2.0"
-  resolved "https://registry.npmjs.org/amplify-cli-logger/-/amplify-cli-logger-1.2.0.tgz#635d22732ac4a6e958d33038ca0b331cfc90e95c"
+  resolved "https://registry.yarnpkg.com/amplify-cli-logger/-/amplify-cli-logger-1.2.0.tgz#635d22732ac4a6e958d33038ca0b331cfc90e95c"
   integrity sha512-MidSMWUyWwPtqtkLvmlLe46P36AqY4TRFggoXuTk//wGtN1wfGCuwTI47aoyBhFoHYiXHRIyo/AXd/fLX8iJAQ==
   dependencies:
     winston "^3.3.3"
     winston-daily-rotate-file "^4.5.0"
 
 [email protected]:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/amplify-cli-shared-interfaces/-/amplify-cli-shared-interfaces-1.1.0.tgz#105c8645c50bb469272badf2501505793c3974de"
+  resolved "https://registry.yarnpkg.com/amplify-cli-shared-interfaces/-/amplify-cli-shared-interfaces-1.1.0.tgz#105c8645c50bb469272badf2501505793c3974de"
   integrity sha512-lN5Y4PfyY5SSCZLxRSfv3qhYYSEwEsFG9T+SbQIf05o6Yfim93Xy9f+1pAAlGc3f/HWjEqdegAH3HG496/BGeg==
 
 amplify-codegen@^3.0.0: