Merge branch 'es/doc-gitsubmodules-markup'

diff --git a/mailmap.c b/mailmap.c
index 13f0d2884e25edef3fde5bdf72b89a770111e472..962fd86d6d7067e84bc0dbf499cc0c47b6ad3c11 100644 (file)
--- a/mailmap.c
+++ b/mailmap.c
@@ -1,6 +1,7 @@
 #include "cache.h"
 #include "string-list.h"
 #include "mailmap.h"
+#include "object-store.h"
 
 #define DEBUG_MAILMAP 0
 #if DEBUG_MAILMAP