From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Mon, 3 Jun 2013 20:25:24 +0000 (+0200)
Subject: fixup: botched merge for 'bin/automake.in'
X-Git-Tag: v1.16~69
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fefd1876075f39aa085d1b48c535e1f5808217b1;p=thirdparty%2Fautomake.git

fixup: botched merge for 'bin/automake.in'

* bin/automake.in (print_autodist_files): Here, we had unwittingly
botched up a 'format' invocation during the latest maint -> master
merge.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

diff --git a/bin/automake.in b/bin/automake.in
index e78c00577..07a63c20f 100644
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -7745,7 +7745,7 @@ sub print_autodist_files
 
   my @four;
   format USAGE_FORMAT =
- <<<<<<<<<<<<<<<<   @<<<<<<<<<<<<<<<<   @<<<<<<<<<<<<<<<<   @<<<<<<<<<<<<<<<<
+  @<<<<<<<<<<<<<<<<   @<<<<<<<<<<<<<<<<   @<<<<<<<<<<<<<<<<   @<<<<<<<<<<<<<<<<
   $four[0],           $four[1],           $four[2],           $four[3]
 .
   local $~ = "USAGE_FORMAT";