[cheriot] Fix bad cherry-pick when merging.

Author: resistor

lld/ELF/Arch/RISCV.cpp

@@ -1139,13 +1139,8 @@ static bool relax(InputSection &sec, int pass) {
     case R_RISCV_CALL:
     case R_RISCV_CALL_PLT:
     case R_RISCV_CHERI_CCALL:
-<<<<<<< HEAD
-      if (relaxable(relocs, i))
-=======
     case R_RISCV_CHERIOT_CCALL:
-      if (i + 1 != sec.relocs().size() &&
-          sec.relocs()[i + 1].type == R_RISCV_RELAX)
->>>>>>> 4feeffbf8ec3 ([cheriot] Add an R_RISCV_CHERIOT_CCALL reloc)
+      if (relaxable(relocs, i))
         relaxCall(sec, i, loc, r, remove);
       break;
     case R_RISCV_TPREL_HI20: