Fix conflicts
[claws.git] / manual / dist / .cvsignore
1 claws-mail-manual.*
2 Makefile
3 Makefile.in