mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fix cvs update problem

Browse Source
This commit is contained in:
Christophe Bothamy 2003-05-03 16:39:35 +00:00
parent f43d2fe3e9
commit 768902a199
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bochs/doc/docbook/misc.txt
View File

@ -1,10 +1,4 @@
<<<<<<< misc.txt $Id: misc.txt,v 1.25 2003-05-03 16:39:35 cbothamy Exp $
$Id: misc.txt,v 1.24 2003-05-03 16:37:17 cbothamy Exp $
=======
$Id: misc.txt,v 1.24 2003-05-03 16:37:17 cbothamy Exp $
>>>>>>> 1.21.8.1
Testing testing....
This is a temporary place to paste in stuff that should go into the docs one This is a temporary place to paste in stuff that should go into the docs one
day. When it is transferred into docbook, let's remove it from misc.txt. day. When it is transferred into docbook, let's remove it from misc.txt.