Merge branch 'tk/typofix-connect-unknown-proto-error'

diff --git a/cache.h b/cache.h
index 79066e57dc806d118366d9807e0af338b72e2fb2..752031e84ab8231a3bf516951b05aa8a6434aa25 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1091,7 +1091,6 @@ struct date_mode {
                DATE_NORMAL = 0,
                DATE_RELATIVE,
                DATE_SHORT,
-               DATE_LOCAL,
                DATE_ISO8601,
                DATE_ISO8601_STRICT,
                DATE_RFC2822,
@@ -1099,6 +1098,7 @@ struct date_mode {
                DATE_RAW
        } type;
        const char *strftime_fmt;
+       int local;
 };
 
 /*