diff options
| author | Karl Williamson <public@khwilliamson.com> | 2012-01-23 07:44:38 -0700 |
|---|---|---|
| committer | Karl Williamson <public@khwilliamson.com> | 2012-01-23 07:54:22 -0700 |
| commit | a9a249629c8a321606e6b817e73a8f8a2c0ae36f (patch) | |
| tree | 9677f9ba560fc904184d450af238fbecd00a27d8 | |
| parent | 3a482d8d6250628185cb4de79a85f353ba799a58 (diff) | |
| download | perl-a9a249629c8a321606e6b817e73a8f8a2c0ae36f.tar.gz | |
perldelta: Rmv git relict line
This line was a result of clearing a rebasing conflict, and I failed to
remove it.
| -rw-r--r-- | pod/perldelta.pod | 2 |
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 |