In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/a9a249629c8a321606e6b817e73a8f8a2c0ae36f?hp=3a482d8d6250628185cb4de79a85f353ba799a58>

- Log -----------------------------------------------------------------
commit a9a249629c8a321606e6b817e73a8f8a2c0ae36f
Author: Karl Williamson <[email protected]>
Date:   Mon Jan 23 07:44:38 2012 -0700

    perldelta: Rmv git relict line
    
    This line was a result of clearing a rebasing conflict, and I failed to
    remove it.
-----------------------------------------------------------------------

Summary of changes:
 pod/perldelta.pod |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

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

--
Perl5 Master Repository

Reply via email to