vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

I forgot to remove a conflict indicator.

Browse source
This commit is contained in:
okuji 2000-06-18 13:59:32 +00:00
parent c67be0dccd
commit 7d6453ac9c
1 changed files with 0 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -82,7 +82,6 @@
quite inconsistent with hard disks? Why not /dev/fd[a-z]?) quite inconsistent with hard disks? Why not /dev/fd[a-z]?)
Report by Pavel Roskin. Report by Pavel Roskin.
>>>>>>> 1.258
2000-06-08 OKUJI Yoshinori <okuji@gnu.org> 2000-06-08 OKUJI Yoshinori <okuji@gnu.org>
* docs/tutorial.texi (Network): The body is moved to ... * docs/tutorial.texi (Network): The body is moved to ...