mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-03 23:28:58 +00:00
Update conflict merge for 5.6.1. This is a rotten hack, but it
works for all FreeBSD purposes.
This commit is contained in:
parent
19026919f5
commit
0e8d8a09a5
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=92454
|
@ -18,7 +18,7 @@ my $glossary = $ARGV[1] || 'Porting/Glossary';
|
|||
|
||||
|
||||
open CONFIG, ">$config_pm" or die "Can't open $config_pm: $!\n";
|
||||
$myver = "v5.6.0"; # XXX - Yuck - allow bootstrapping. MarkM
|
||||
$myver = "v5.6.1"; # XXX - Yuck - allow bootstrapping. MarkM
|
||||
|
||||
print CONFIG <<'ENDOFBEG_NOQ', <<"ENDOFBEG";
|
||||
package Config;
|
||||
|
|
Loading…
Reference in a new issue