I just tried merging it against lp:activity-log-manager locally and it went fine. It'd also show conflicts here if there were some.
I've merged the branch against tip and updated the references in POTFILES.in. make distcheck is now working fine locally. -- https://code.launchpad.net/~ev/activity-log-manager/split-out-diagnostics-service/+merge/175820 Your team Activity Log Manager is subscribed to branch lp:activity-log-manager. _______________________________________________ Mailing list: https://launchpad.net/~zeitgeist Post to : email@example.com Unsubscribe : https://launchpad.net/~zeitgeist More help : https://help.launchpad.net/ListHelp