[pkg-lynx-commits] [lynx-cur] 01/01: merge with master

[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 1b7bb50c508238c861f6ceb7c3978434421fb267
Author: Denis Briand <debian at denis-briand.fr>
Date:   Fri Mar 6 11:57:08 2015 +0100

    merge with master
---
 debian/changelog | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7c104d2..0d4e1a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,14 +16,11 @@ lynx-cur (2.8.9dev4-2) UNRELEASED; urgency=medium
   [ 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
+  * 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)
 
  -- 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