perldelta: Rmv git relict line

[perl5.git] / pod / perldelta.pod

diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index b0e3d24..c44ee45 100644 (file)
--- 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