Merge lp:~ps-jenkins/account-plugins/latestsnapshot-0.11+13.10.20140414.2-0ubuntu1 into lp:account-plugins/13.10

Proposed by PS Jenkins bot on 2014-04-19
Status: Rejected
Rejected by: Robert Bruce Park on 2014-04-19
Proposed branch: lp:~ps-jenkins/account-plugins/latestsnapshot-0.11+13.10.20140414.2-0ubuntu1
Merge into: lp:account-plugins/13.10
Diff against target: 25 lines (+17/-0) (has conflicts)
1 file modified
debian/changelog (+17/-0)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~ps-jenkins/account-plugins/latestsnapshot-0.11+13.10.20140414.2-0ubuntu1
Reviewer Review Type Date Requested Status
Online Accounts 2014-04-19 Pending
Review via email: mp+216525@code.launchpad.net

Commit message

Releasing 0.11+13.10.20140414.2-0ubuntu1 (revision 133 from lp:account-plugins/13.10)

To post a comment you must log in.

Unmerged revisions

134. By PS Jenkins bot on 2014-04-14

Releasing 0.11+13.10.20140414.2-0ubuntu1, based on r133

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2014-04-14 21:05:27 +0000
+++ debian/changelog 2014-04-19 20:53:39 +0000
@@ -1,4 +1,21 @@
1<<<<<<< TREE
1account-plugins (0.11+13.10.20140414.1-0ubuntu1) saucy; urgency=low2account-plugins (0.11+13.10.20140414.1-0ubuntu1) saucy; urgency=low
3=======
4account-plugins (0.11+13.10.20140414.2-0ubuntu1) saucy; urgency=low
5
6 [ Ubuntu daily release ]
7 * New rebuild forced
8
9 [ Robert Bruce Park ]
10 * Revert erroneous maintscript creation.
11
12 [ Ubuntu daily release ]
13 * Automatic snapshot from revision 133
14
15 -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 14 Apr 2014 20:26:36 +0000
16
17account-plugins (0.11+13.10.20140414-0ubuntu1) saucy; urgency=low
18>>>>>>> MERGE-SOURCE
219
3 [ Alberto Mardegan ]20 [ Alberto Mardegan ]
4 * Use new Canonical-owned facebook application key (LP: #1304798)21 * Use new Canonical-owned facebook application key (LP: #1304798)

Subscribers

People subscribed via source and target branches