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

"go ahead" espie@
2005-08-09 15:52:46 +00:00
..
2005-04-17 22:26:42 +00:00
2005-08-09 15:52:46 +00:00
2005-07-30 23:36:30 +00:00