From a9a249629c8a321606e6b817e73a8f8a2c0ae36f Mon Sep 17 00:00:00 2001 From: Karl Williamson Date: Mon, 23 Jan 2012 07:44:38 -0700 Subject: [PATCH] perldelta: Rmv git relict line This line was a result of clearing a rebasing conflict, and I failed to remove it. --- pod/perldelta.pod | 2 -- 1 file changed, 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. ->>>>>>> Add :not_characters parameter to 'use locale' - =head1 Security XXX Any security-related notices go here. In particular, any security -- 1.8.3.1