Merge branch 'maint'

diff --git a/builtin-annotate.c b/builtin-annotate.c
index 9db7cfe74c7a8583995e6c20c4eedebf58391fbc..fc43eed36b55e4966796490b8c0a02fae790229c 100644 (file)
--- a/builtin-annotate.c
+++ b/builtin-annotate.c
@@ -22,4 +22,3 @@ int cmd_annotate(int argc, const char **argv, const char *prefix)
 
        return cmd_blame(argc + 1, nargv, prefix);
 }
-