We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent b605aa1 commit c47b65dCopy full SHA for c47b65d
kernel/error.c
@@ -35,12 +35,4 @@ static const struct error_code error_desc[] = {
35
{ERR_UNKNOWN, "unknown error"},
36
};
37
38
-<<<<<<< HEAD
39
40
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