conflict fragment committed on merge of 2007-11-c

[Bradley Dean]

Hi Paul,

It looks to me like a bit of a conflict crept into perl589delta.pod in
this commit to the master branch:

ee88bd7e (Paul Fenwick 2008-10-06 02:03:19 +1100 1041)

If you look just before '=head1 Selected Bug Fixes' we have:

=back
=======
$Config{useshrplib} is now 'true' rather than 'yes' when using a shared
perl
library.
>>>>>>> origin/2007-11-c:perl589delta.pod

=head1 Selected Bug Fixes

I suspect that this is meant to be an extra =item * just before the =back.

I haven't committed anything because it's on master and I gather confusion
and cthulhu-like horrors can arise when conflicting commits occur there.

Cheerio,

Brad

--
Bradley Dean
Software Engineer - http://bjdean.id.au/
Email: bjd...@bjdean.id.au Skype: sk...@bjdean.id.au
Mobile(Aus): +61-413014395 Mobile(UK): +44-7846895073

[Jacinta Richardson]

Thanks for spotting that Brad. Paul's in training this week, but I'll try to
get him to have a look during our lunch break. ;)

J

[Paul Fenwick]

G'day Brad,

Bradley Dean wrote:

> It looks to me like a bit of a conflict crept into perl589delta.pod in
> this commit to the master branch:
>
> ee88bd7e (Paul Fenwick 2008-10-06 02:03:19 +1100 1041)

[snip]

Nicely spotted! That shouldn't be there, and I suspect is due to me doing
merges at 2am. ;) The actual message was misplaced, it's not VMS specific,
but instead relates to the config system.

I've removed the conflict markers, and moved the message to the right spot,
and pushed.

Thanks again!

Paul

--
Paul Fenwick <p...@perltraining.com.au> | http://perltraining.com.au/
Director of Training | Ph: +61 3 9354 6001
Perl Training Australia | Fax: +61 3 9354 2681