Activity Log Manager

Merge lp:~paolorotolo/activity-log-manager/fix-for-943066 into lp:~activity-log-manager/activity-log-manager/vala

  1. fix-for-943066
  2. Merge into vala
Proposed by Paolo Rotolo
Status: Rejected
Rejected by: Manish Sinha (मनीष सिन्हा)
Proposed branch: lp:~paolorotolo/activity-log-manager/fix-for-943066
Merge into: lp:~activity-log-manager/activity-log-manager/vala
Diff against target: 25 lines (+10/-0) (has conflicts)
1 file modified
ChangeLog (+10/-0)
Text conflict in ChangeLog
To merge this branch: bzr merge lp:~paolorotolo/activity-log-manager/fix-for-943066
Reviewer Review Type Date Requested Status
Activity Log Manager Pending
Review via email: mp+96897@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Manish Sinha (मनीष सिन्हा) (manishsinha) wrote :

This has already been fixed.

Unmerged revisions

95. By Paolo Rotolo

fix typo in /src/history-widget.vala:68: applicaitons → applications (LP: #943066)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2012-03-03 11:43:23 +0000
3+++ ChangeLog 2012-03-10 21:16:18 +0000
4@@ -1,4 +1,5 @@
5 ------------------------------------------------------------
6+<<<<<<< TREE
7 revno: 98
8 fixes bug: https://launchpad.net/bugs/930093
9 committer: Manish Sinha <manishsinha@ubuntu.com>
10@@ -64,6 +65,15 @@
11 message:
12 Update NEWS
13 ------------------------------------------------------------
14+=======
15+revno: 90
16+committer: Paolo Rotolo <paolorotolo@ubuntu-it.org>
17+branch nick: activity-log-manager
18+timestamp: Wed 2012-02-29 15:46:30 +0100
19+message:
20+ fix typo in /src/history-widget.vala:68: applicaitons → applications (LP: #943066)
21+------------------------------------------------------------
22+>>>>>>> MERGE-SOURCE
23 revno: 89
24 committer: Manish Sinha <manishsinha@ubuntu.com>
25 branch nick: alm

Subscribers

People subscribed via source and target branches