Remove merge conflict markers from error.c

Author: G36maid

kernel/error.c

@@ -35,12 +35,4 @@ static const struct error_code error_desc[] = {
     {ERR_UNKNOWN, "unknown error"},
 };
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 const struct error_code *const perror = error_desc;
-=======
-const struct error_code * const perror = error_desc;
->>>>>>> de976a5 (Constify error_desc and perror)
-=======
-const struct error_code *const perror = error_desc;
->>>>>>> 888f673 (Ensure consistent indention)