Fix Merge Conflicts #47

Annotations

11 warnings

The following actions uses Node.js version which is deprecated and will be forced to run on node20: actions/setup-node@v3. For more info: https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/

Unable to find merge base between 8e1340b890cef83117a4b319bea395b26991c0aa and 8d9947cc2cf992a5606c7cba6e990d30e876d735

Set 'fetch_additional_submodule_history: true' to fetch additional submodule history for: lib/aave-helpers

fatal: Invalid revision range 8e1340b890cef83117a4b319bea395b26991c0aa..8d9947cc2cf992a5606c7cba6e990d30e876d735

Please ensure that submodules are initialized and up to date. See: https://github.com/actions/checkout#usage

Unable to find merge base between d6cb9dab3eb7bff1cd3bfb0e1d2fb634f594f120 and 55a0b5939c7083c61d5651b80454095cb1f6757c

Set 'fetch_additional_submodule_history: true' to fetch additional submodule history for: lib/ccip

fatal: Invalid revision range d6cb9dab3eb7bff1cd3bfb0e1d2fb634f594f120..55a0b5939c7083c61d5651b80454095cb1f6757c

Please ensure that submodules are initialized and up to date. See: https://github.com/actions/checkout#usage

Unable to find merge base between a9647e1b581c7f781d36ec34fb5174d29a1ec7ba and 3a3293b17eb985ac230a4e3bc6a1aafd682de3d5

Set 'fetch_additional_submodule_history: true' to fetch additional submodule history for: lib/gho-core