zeitgeist team mailing list archive

Thread
Date

Re: [Merge] lp:~ev/activity-log-manager/split-out-diagnostics-service into lp:activity-log-manager

To: Evan Dandrea <evan.dandrea@xxxxxxxxxxxxx>
From: Evan Dandrea <evan.dandrea@xxxxxxxxxxxxx>
Date: Sat, 20 Jul 2013 20:44:24 -0000
In-reply-to: <20130719123724.1592.42847.launchpad@ackee.canonical.com>
Reply-to: mp+175820@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

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.

References

[Merge] lp:~ev/activity-log-manager/split-out-diagnostics-service into lp:activity-log-manager
From: Evan Dandrea, 2013-07-19