Ok, so will I need to update trunk, then merge trunk in to my branch. Then recommit?
Phill On 13 February 2011 15:33, Tim Bentley <[email protected]> wrote: > Review: Needs Fixing > Looks fine apart from a clash with JT's cleanup patches. > This will need to be updated once that goes in. > -- > https://code.launchpad.net/~phill-ridout/openlp/ssp_import/+merge/49548<https://code.launchpad.net/%7Ephill-ridout/openlp/ssp_import/+merge/49548> > You are the owner of lp:~phill-ridout/openlp/ssp_import. > -- [email protected] - Google Talk, MSN phillr_97 - Skype https://code.launchpad.net/~phill-ridout/openlp/ssp_import/+merge/49548 Your team OpenLP Core is subscribed to branch lp:openlp. _______________________________________________ Mailing list: https://launchpad.net/~openlp-core Post to : [email protected] Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp

