Skip to content

Commit c47b65d

Browse files
committed
Remove merge conflict markers from error.c
1 parent b605aa1 commit c47b65d

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

kernel/error.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,4 @@ static const struct error_code error_desc[] = {
3535
{ERR_UNKNOWN, "unknown error"},
3636
};
3737

38-
<<<<<<< HEAD
39-
<<<<<<< HEAD
4038
const struct error_code *const perror = error_desc;
41-
=======
42-
const struct error_code * const perror = error_desc;
43-
>>>>>>> de976a5 (Constify error_desc and perror)
44-
=======
45-
const struct error_code *const perror = error_desc;
46-
>>>>>>> 888f673 (Ensure consistent indention)

0 commit comments

Comments
 (0)