[DRE-commits] [ruby-redis-rack] 05/05: Fix merge conflicts

[Balasankar C]

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

balasankarc-guest pushed a commit to branch master
in repository ruby-redis-rack.

commit 86be1ee315d10de9355543a93f4548427ce339c0
Merge: 2e88c52 7e371fe
Author: Balasankar C <balasankarc at autistici.org>
Date:   Tue Dec 2 20:55:53 2014 +0530

    Fix merge conflicts

 .pc/.quilt_patches                                 |  1 +
 .pc/.quilt_series                                  |  1 +
 .pc/.version                                       |  1 +
 .pc/applied-patches                                |  1 +
 .../version/test}/redis/rack/version_test.rb       |  2 +-
 .pc/version/test/test_helper.rb                    |  5 ++++
 debian/changelog                                   | 14 +++++++++++
 debian/control                                     |  2 +-
 debian/patches/Bundler                             | 17 --------------
 debian/patches/Version                             | 18 ---------------
 debian/patches/series                              |  3 +--
 debian/patches/version                             | 27 ++++++++++++++++++++++
 debian/ruby-tests.rake                             | 27 ++++++++++++++++++++--
 debian/rules                                       |  8 -------
 test/redis/rack/version_test.rb                    |  2 +-
 15 files changed, 79 insertions(+), 50 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-redis-rack.git