Fix sbt assembly (remove duplicate classes, fix conflicts)

Browse Source

...

This commit is contained in:

abejgonzalez

2023-03-03 15:36:36 -08:00

parent 8c8820a678

commit fd62d9ec2d

7 changed files with 32 additions and 19 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

0

generators/chipyard/src/main/resources/csrc/emulator.cc → generators/chipyard/src/main/resources/csrc/cy-emulator.cc

2

generators/cva6

Submodule generators/cva6 updated: 737fd83b82...6a6184f292

2

generators/riscv-sodor

Submodule generators/riscv-sodor updated: d6ccc5de5c...1b169845e3