Merge branch 'maint'

diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index a78a9ff1b85d1c8cf003ddab63b8412cf3083657..997594549fbf5a1e50a7d187c3cebcbe93461455 100644 (file)
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -180,4 +180,3 @@ Documentation by David Greaves, Junio C Hamano, Josh Triplett, and the git-list
 GIT
 ---
 Part of the gitlink:git[7] suite
-