aanriot 8b6afd7b17 - fix info files.
- remove useless conflict.

"go ahead" espie@
2005-08-09 15:52:46 +00:00
..
2005-07-30 23:35:31 +00:00
2005-08-09 15:52:46 +00:00
2005-07-30 23:35:31 +00:00
2005-08-09 15:52:46 +00:00