Fix conflict

Browse Source

...

This commit is contained in:

Zitao Fang

2021-06-04 00:51:09 -07:00

parent a18f74053f

commit f8f7d36294

1 changed files with 1 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2

toolchains/esp-tools/riscv-isa-sim

Submodule toolchains/esp-tools/riscv-isa-sim updated: 2f8211022e...88c223fe7a