Commit c466874

committed

resolve merge conflicts

1 parent 578bd33 commit c466874Copy full SHA for c466874

8 files changed

+588

-664

lines changed

.github/workflows
- lint-actions.yml
Cargo.lock
Cargo.toml
Makefile
crates
- ethereum-forks/src
  - hardfork.rs
- node-core/src/args
  - utils.rs
- optimism/evm/src
  - execute.rs
- storage/provider/src/providers/database
  - provider.rs

8 files changed

+588

-664

lines changed

`‎.github/workflows/lint-actions.yml‎`

This file was deleted.

Comments

(0)