On Sun, Jul 04, 2010 at 04:05:44PM -0000 or thereabouts, Raoul Snyman wrote:
> Watch out, you have a conflict. You might want to merge from trunk into your
> branch sometime and fix the conflict.
Hmm. I thought I'd done that already. I'll have another look!
Cheers,
Martin
--
mar...@parallelpoints.com
int deep_thought(void) {
sleep (7.5e6*365*24*60*60); return 42;
}
https://code.launchpad.net/~mjthompson/openlp/opensong_import/+merge/29148
Your team OpenLP Core is requested to review the proposed merge of
lp:~mjthompson/openlp/opensong_import into lp:openlp.
_______________________________________________
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
