[pkg-lynx-commits] [lynx-cur] 02/02: Merge branch 'master' of git+ssh://anonscm.debian.org/git/pkg-lynx/lynx-cur

[Denis Briand]

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

narcan-guest pushed a commit to branch master
in repository lynx-cur.

commit 7f17eb3be26c828673b656c3bb29e308ac333446
Merge: 5fb90c5 28e885b
Author: Denis Briand <debian at denis-briand.fr>
Date:   Fri Mar 6 11:52:49 2015 +0100

    Merge branch 'master' of git+ssh://anonscm.debian.org/git/pkg-lynx/lynx-cur
    
    Conflicts:
    	debian/changelog

 debian/changelog | 5 +++++
 1 file changed, 5 insertions(+)

diff --cc debian/changelog
index 3ab612b,cb9329f..7c104d2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -16,9 -16,8 +16,14 @@@ lynx-cur (2.8.9dev4-2) UNRELEASED; urge
    [ Denis Briand ]
    * New maintainers. Add team and co-maintainers e-mail
      addresses. (Closes: #773942)
++<<<<<<< HEAD
 +  * Update debian/copyright to machine-readable format version 1. 
 +  * Switch NESTED_TABLES option to false (Closes: #387555) 
 +  * Add Delete key usage into manpage (Closes: #74358) 
++=======
+   * Update debian/copyright to machine-readable format version 1.
+   * Switch NESTED_TABLES option to false (Closes: #387555)
++>>>>>>> 28e885b9228d67cb984f15a1f3164eedde7b9fd7
  
   -- Axel Beckert <abe at debian.org>  Thu, 12 Feb 2015 00:48:29 +0100
  

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