[Reportbug-commits] [reportbug] 02/11: fix conflict

[Sandro Tosi]

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

morph pushed a commit to branch master
in repository reportbug.

commit 947f9ca665366bb2e030e2cbbf57ad6ce455c704
Merge: ca37faf 8e2b3db
Author: Sandro Tosi <morph at debian.org>
Date:   Sun Apr 12 19:54:07 2015 +0100

    fix conflict

 debian/changelog | 4 +++-
 share/script     | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 2a95912,00d89ae..9c10236
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,12 @@@
  reportbug (6.6.4) UNRELEASED; urgency=medium
  
 +  * reportbug/debbugs.py
 +    - fix usage of singular they in RFH description; thanks to Doug Torrance for
 +      the report; Closes: #776015
+   * share/script
+     - report PAGER environment variable when filing a bug against reportbug
  
-  -- Sandro Tosi <morph at debian.org>  Sat, 24 Jan 2015 14:19:01 +0000
+  -- Sandro Tosi <morph at debian.org>  Thu, 05 Feb 2015 12:06:31 +0000
  
  reportbug (6.6.3) unstable; urgency=medium
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reportbug/reportbug.git