[libhtml-scrubber-perl] 21/30: Merge branch 'pr/purge-trailing-whitespace' of https://github.com/paultcochrane/html-scrubber into integration_branch

[Florian Schlichting]

This is an automated email from the git hooks/post-receive script.

fsfs pushed a commit to annotated tag release/0.16
in repository libhtml-scrubber-perl.

commit f381ccb3aa7fbc87f93e37f36753ca02e39a69c4
Merge: 1b693f3 1801f06
Author: Nigel Metheringham <nigelm at cpan.org>
Date:   Sun Jun 25 16:49:39 2017 +0100

    Merge branch 'pr/purge-trailing-whitespace' of https://github.com/paultcochrane/html-scrubber into integration_branch
    
    # Conflicts:
    #	.travis.yml

 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --cc .travis.yml
index 7835b89,a4ce378..9aa7efd
--- a/.travis.yml
+++ b/.travis.yml
@@@ -1,16 -1,13 +1,16 @@@
  language: perl
- perl: 
+ perl:
 +  - "5.26"
 +  - "5.24"
 +  - "5.22"
    - "5.20"
    - "5.18"
 -#  - "5.16"
 -#  - "5.14"
 +  - "5.16"
 +  - "5.14"
  
  before_install:
  
--  # prevent "plelase tell me who you are errors for certain DZIL configs
++  # prevent "please tell me who you are errors for certain DZIL configs
    - git config --global user.name "Travis CI"
  
  install:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libhtml-scrubber-perl.git