remove cruft from conflict resolution
authorDavid Bremner <bremner@unb.ca>
Mon, 1 Sep 2008 13:55:42 +0000 (10:55 -0300)
committerDavid Bremner <bremner@unb.ca>
Mon, 1 Sep 2008 13:55:42 +0000 (10:55 -0300)
commit93626e78f6fa1459c5d23db805ed2a9d1095e2ab
tree2276457a574279a0afea1ef8a8c7f84eabc9bc23
parent1ea91b267302b1615da6eb6a3a992c057bbdf0c6
remove cruft from conflict resolution
IkiWiki/Plugin/mailbox.pm