[liburi-find-perl] 27/31: fix mismerge

Sat Jul 25 17:41:52 UTC 2015

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

gregoa pushed a commit to branch master
in repository liburi-find-perl.

commit ddbc95dd80dd97fa4f92e32345d1f739365e9503
Author: Dominic Hargreaves <dom at earth.li>
Date:   Sun Apr 8 11:50:13 2012 +0100

    fix mismerge
---
 Changes       | 62 -----------------------------------------------------------
 MANIFEST.SKIP |  2 +-
 2 files changed, 1 insertion(+), 63 deletions(-)

diff --git a/Changes b/Changes
index aa52e88..58598cd 100644
--- a/Changes
+++ b/Changes
@@ -76,68 +76,6 @@
     * Minimum Perl version is now 5.6.0.
 
 
-20100505  Wed May  5 18:48:44 PDT 2010
-    Test Fixes
-    * Fixed t/urifind/find.t on Windows
-
-
-20100504.1039  Tue May  4 10:39:23 PDT 2010
-    Doc Fixes
-    * Forgot to mention that we ship with urifind now.
-
-
-20100504  Tue May  4 10:29:52 PDT 2010
-    New Features
-    * Added a urifind program. (Darren Chamberlain)
-    Bug Fixes
-    * The final semi-colon was being strippped form URLs found in HTML
-      that ended with HTML entities. (Michael Peters)
-      Example: http://google.com/search?q=<html>
-    * URLs with leading dots, pluses and minuses are now found.
-      [rt.cpan.org 57032]
-      Example: stuff...http://example.com
-
-
-20100211  Thu Feb 11 04:02:26 PST 2010
-    Bug Fixes
-    * Finding URIs inside brackets was pretty badly broken by
-      the last release.  (Michael Peters)
-
-
-20090319  Thu Mar 19 12:17:53 PDT 2009
-    Bug Fixes
-    * Schemeless now ignores the case of the TLD.
-
-    New Features
-    * Updated the list of accepted domains for finding schemeless URIs
-      from the latest ICANN list.
-
-    Docs
-    * Add LICENSE section
-    * Remove wildly out of date CAVEATS
-    * Added an example of how to get a list of all URIs.
-    * Updated INSTALL section to reflect new dependencies and Module::Build
-      installation process
-    * Regenerated the README file
-
-
-20090316  Mon Mar 16 16:18:10 PDT 2009
-    New Features
-    * Added optional replacement function to find(). Now you 
-      can not only replace URLs found, but also the rest of the text around
-      them in one fell swoop. (Mike Schilli) [rt.cpan.org 20486]
-    * Whitespace inside <...> is now ignored as per the suggestion of
-      RFC 3986 appendix C. [rt.cpan.org 20483]
-
-    Other
-    * Michael G Schwern is now primary maintainer again.  Thanks for all your
-      work, Roderick!
-    * Repository moved to http://github.com/schwern/uri-find
-    * Now requires Test::More
-    * Verisoning scheme changed to ISO date integers
-    * Minimum Perl version is now 5.6.0.
-
-
 0.16 Fri Jul 22 06:00:24 EDT 2005
     - Oops, make the URI::Find::Schemeless->top_level_domain_re case
       insensitive, as it should be and the docs claimed it was.  Thanks
diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
index e1dc26e..1464c30 100644
--- a/MANIFEST.SKIP
+++ b/MANIFEST.SKIP
@@ -60,4 +60,4 @@
 
 # Avoid patches and diff files lying around
 \.patch$
-\.diff$
+\.diff$
\ No newline at end of file

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

