From: Karl Williamson <public@khwilliamson.com>
Date: Mon, 23 Jan 2012 14:44:38 +0000 (-0700)
Subject: perldelta: Rmv git relict line
X-Git-Tag: v5.15.8~403
X-Git-Url: https://perl5.git.perl.org/perl5.git/commitdiff_plain/a9a249629c8a321606e6b817e73a8f8a2c0ae36f

perldelta: Rmv git relict line

This line was a result of clearing a rebasing conflict, and I failed to
remove it.
---

diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index b0e3d24..c44ee45 100644
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -44,8 +44,6 @@ available for ARGV and environment variable conversions.
 
 Full details are in L<perllocale>.
 
->>>>>>> Add :not_characters parameter to 'use locale'
-
 =head1 Security
 
 XXX Any security-related notices go here.  In particular, any security