zeitgeist team mailing list archive

[Paolo Rotolo <rotolopao@xxxxxxxxx>]

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 <manishsinha@xxxxxxxxxx>
@@ -64,6 +65,15 @@
 message:
   Update NEWS
 ------------------------------------------------------------
+=======
+revno: 90
+committer: Paolo Rotolo <paolorotolo@xxxxxxxxxxxxx>
+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 <manishsinha@xxxxxxxxxx>
 branch nick: alm