Paolo Rotolo has proposed merging 
lp:~paolorotolo/activity-log-manager/fix-for-943066 into 
lp:activity-log-manager.

Requested reviews:
  Activity Log Manager (activity-log-manager)
Related bugs:
  Bug #943066 in activity-log-manager (Ubuntu): "typo in 
../src/history-widget.vala:68 -- applicaitons"
  https://bugs.launchpad.net/ubuntu/+source/activity-log-manager/+bug/943066

For more details, see:
https://code.launchpad.net/~paolorotolo/activity-log-manager/fix-for-943066/+merge/96897
-- 
https://code.launchpad.net/~paolorotolo/activity-log-manager/fix-for-943066/+merge/96897
Your team Activity Log Manager is requested to review the proposed merge of 
lp:~paolorotolo/activity-log-manager/fix-for-943066 into 
lp:activity-log-manager.
=== modified file 'ChangeLog'
--- ChangeLog	2012-03-03 11:43:23 +0000
+++ ChangeLog	2012-03-10 21:16:18 +0000
@@ -1,4 +1,5 @@
 ------------------------------------------------------------
+<<<<<<< TREE
 revno: 98
 fixes bug: https://launchpad.net/bugs/930093
 committer: Manish Sinha <manishsi...@ubuntu.com>
@@ -64,6 +65,15 @@
 message:
   Update NEWS
 ------------------------------------------------------------
+=======
+revno: 90
+committer: Paolo Rotolo <paolorot...@ubuntu-it.org>
+branch nick: activity-log-manager
+timestamp: Wed 2012-02-29 15:46:30 +0100
+message:
+  fix typo in /src/history-widget.vala:68: applicaitons → applications (LP: #943066)
+------------------------------------------------------------
+>>>>>>> MERGE-SOURCE
 revno: 89
 committer: Manish Sinha <manishsi...@ubuntu.com>
 branch nick: alm

_______________________________________________
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