remove conflicts
authorPaul Mangan <paul@claws-mail.org>
Fri, 30 Nov 2001 07:12:34 +0000 (07:12 +0000)
committerPaul Mangan <paul@claws-mail.org>
Fri, 30 Nov 2001 07:12:34 +0000 (07:12 +0000)
commit5b6b7e444b582d41449c715385f5f257ce0bb7b5
treeac3f3e906dbde6beb7fd14fb2162996e08a372fb
parent279c1da346d300d9aa332ba16b263fd35ba134e2
remove conflicts
src/compose.c