Review: Needs Fixing merge-conflict, distcheck

First, it give a conflict that it cannot delete directory src/diagnostic

Second, even after I manually delete the folder and resolve conflict, distcheck 
fails because 2 files in po/POTFILES.in still reference the older ui file and C 
file in diagnostic folder

Please take care of these two issues and make sure that it still works as you 
expected it to work
-- 
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     : zeitgeist@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zeitgeist
More help   : https://help.launchpad.net/ListHelp

Reply via email to