Online Accounts: Account plugins

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

  1. latestsnapshot-0.11+13.10.20140414.2-0ubuntu1
  2. Merge into 13.10
Proposed by PS Jenkins bot
Status: Rejected
Rejected by: Robert Bruce Park
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 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

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

Subscribers

People subscribed via source and target branches