Fix merge

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
David Abdurachmanov 2023-12-04 07:58:35 +02:00
parent 6ada3f3cfd
commit 8d0bd1022d
Signed by: davidlt
GPG Key ID: 8B7F1DA0E2C9FDBB
1 changed files with 0 additions and 1 deletions

View File

@ -600,7 +600,6 @@ fi
%changelog
%{?llvm_snapshot_changelog_entry}
<<<<<<< HEAD
* Mon Dec 04 2023 David Abdurachmanov <davidlt@rivosinc.com> - 17.0.6-1.0.riscv64
- Disable LTO build
- Disable tests on riscv64 for now