diff options
| author | Tim Newsome <tim@sifive.com> | 2021-10-06 13:45:14 -0700 |
|---|---|---|
| committer | Tim Newsome <tim@sifive.com> | 2021-10-06 14:35:04 -0700 |
| commit | 52b2a4a74455337387357bda341b5cb56310e793 (patch) | |
| tree | 380d208e33e87a93186ef25b7d89376236ac60ff /uncrustify.cfg | |
| parent | c67a887a00789ae7cdb46027b198576672cbf408 (diff) | |
| download | riscv-openocd-52b2a4a74455337387357bda341b5cb56310e793.zip riscv-openocd-52b2a4a74455337387357bda341b5cb56310e793.tar.gz riscv-openocd-52b2a4a74455337387357bda341b5cb56310e793.tar.bz2 | |
Fix incorrectly resolved conflict.
Change-Id: I8dde5f2fc1dbc7b4de6091a934cbe160baadb504
Signed-off-by: Tim Newsome <tim@sifive.com>
Diffstat (limited to 'uncrustify.cfg')
0 files changed, 0 insertions, 0 deletions