summaryrefslogtreecommitdiff
path: root/pod/perldelta.pod
diff options
context:
space:
mode:
Diffstat (limited to 'pod/perldelta.pod')
-rw-r--r--pod/perldelta.pod2
1 files changed, 0 insertions, 2 deletions
diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index b0e3d24907..c44ee4599c 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