Remove merge conflict markers from error.h

Author: G36maid

include/private/error.h

@@ -39,12 +39,4 @@ struct error_code {
     char *const desc;
 };
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 extern const struct error_code *const perror;
-=======
-extern const struct error_code * const perror;
->>>>>>> de976a5 (Constify error_desc and perror)
-=======
-extern const struct error_code *const perror;
->>>>>>> 888f673 (Ensure consistent indention)