diff options
| author | Guillem Jover <guillem@debian.org> | 2010-11-01 08:18:28 +0100 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2010-11-19 05:21:14 +0100 |
| commit | c6ea15b9850f26ea3b5a13667396c89e00aa9890 (patch) | |
| tree | 9da3c56846f1e9f0e75d3ac619713c6467af472a /scripts/dpkg-mergechangelogs.pl | |
| parent | 7ee4f4f2ef5ca3d9fa1426ac93f78ead2280bc36 (diff) | |
| download | dpkg-c6ea15b9850f26ea3b5a13667396c89e00aa9890.tar.gz | |
Cleanup white spaces
Remove trailing spaces. Remove blank lines not separating different code
blocks. Remove blank lines at the end of the file.
Diffstat (limited to 'scripts/dpkg-mergechangelogs.pl')
| -rwxr-xr-x | scripts/dpkg-mergechangelogs.pl | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/dpkg-mergechangelogs.pl b/scripts/dpkg-mergechangelogs.pl index 3ef5e96d8..cea758410 100755 --- a/scripts/dpkg-mergechangelogs.pl +++ b/scripts/dpkg-mergechangelogs.pl @@ -288,4 +288,3 @@ sub get_conflict_block($$) { @b = @{$b} if ref($b) eq "ARRAY"; return ("<<<<<<", @a, "======", @b, ">>>>>>"); } - |