Merge branch 'ds/close-object-store' into maint

diff --git a/string-list.h b/string-list.h
index 18c718c12ce84609ddf7d2baf471042bf9fafc7a..f964399949ce58dc1edd561fb0614776dfa2d01f 100644 (file)
--- a/string-list.h
+++ b/string-list.h
@@ -174,8 +174,8 @@ struct string_list_item *string_list_insert(struct string_list *list, const char
  * Remove the given string from the sorted list.  If the string
  * doesn't exist, the list is not altered.
  */
-extern void string_list_remove(struct string_list *list, const char *string,
-                              int free_util);
+void string_list_remove(struct string_list *list, const char *string,
+                       int free_util);
 
 /**
  * Check if the given string is part of a sorted list. If it is part of the list,