From 2608b8e25dc6a8d29658b66055ce1d942052cdb3 Mon Sep 17 00:00:00 2001 From: Tim Newsome Date: Wed, 29 Aug 2018 16:00:51 -0700 Subject: [PATCH] Fix strange merge. --- src/target/riscv/debug_defines.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/target/riscv/debug_defines.h b/src/target/riscv/debug_defines.h index 0cabf158b..d6ddd4ff1 100644 --- a/src/target/riscv/debug_defines.h +++ b/src/target/riscv/debug_defines.h @@ -1219,8 +1219,6 @@ * * An implementation may report "Other" (7) for any error condition. * -* An implementation may report "Other" (7) for any error condition. -* * 0: There was no bus error. * * 1: There was a timeout.