Merge branch 'master' into next

[paraslash.git] / error.h

diff --git a/error.h b/error.h
index 79931bf425b6028af61ad63d2735d99dcd2cdf5c..c9031f8201695f49fa95dd9b9047228196d581a8 100644 (file)
--- a/error.h
+++ b/error.h
@@ -112,7 +112,6 @@ extern const char **para_errlist[];
 
 #define MOOD_ERRORS \
        PARA_ERROR(NO_MOOD, "no mood available"), \
-       PARA_ERROR(NOT_ADMISSIBLE, "file is not admissible"), \
        PARA_ERROR(DUMMY_ROW, "attempted to access blob dummy object"), \