There's a conflict merging devel into db-develthat could come up. We have attempted to make it not happen via https://code.launchpad.net/~danilo/launchpad/db-add-subscription-link/+merge/56622 , which is running through ec2 land for db-devel, so hopefully there's nothing that needs to be done. However, if a conflict does show up, look for the branch above to resolve it.
Thanks Gary _______________________________________________ Mailing list: https://launchpad.net/~launchpad-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~launchpad-dev More help : https://help.launchpad.net/ListHelp
