Merge lp:~ps-jenkins/libsignon-glib/latestsnapshot-1.9daily13.05.01.2ubuntu.unity.next-0ubuntu1 into lp:libsignon-glib

Proposed by PS Jenkins bot
Status: Merged
Approved by: PS Jenkins bot
Approved revision: 141
Merged at revision: 142
Proposed branch: lp:~ps-jenkins/libsignon-glib/latestsnapshot-1.9daily13.05.01.2ubuntu.unity.next-0ubuntu1
Merge into: lp:libsignon-glib
Diff against target: 26 lines (+11/-0) (has conflicts)
1 file modified
debian/changelog (+11/-0)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~ps-jenkins/libsignon-glib/latestsnapshot-1.9daily13.05.01.2ubuntu.unity.next-0ubuntu1
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Online Accounts Pending
Review via email: mp+161873@code.launchpad.net

Commit message

Releasing 1.9daily13.05.01.2ubuntu.unity.next-0ubuntu1 to ubuntu

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2013-05-01 07:53:28 +0000
+++ debian/changelog 2013-05-01 16:32:28 +0000
@@ -1,12 +1,23 @@
1<<<<<<< TREE
1libsignon-glib (1.9daily13.05.01.1ubuntu.unity.next-0ubuntu1) raring; urgency=low2libsignon-glib (1.9daily13.05.01.1ubuntu.unity.next-0ubuntu1) raring; urgency=low
3=======
4libsignon-glib (1.9daily13.05.01.2ubuntu.unity.next-0ubuntu1) raring; urgency=low
5>>>>>>> MERGE-SOURCE
26
3 [ Ken VanDine ]7 [ Ken VanDine ]
4 * Automatic snapshot from revision 138 (bootstrap)8 * Automatic snapshot from revision 138 (bootstrap)
59
10<<<<<<< TREE
6 [ Ubuntu daily release ]11 [ Ubuntu daily release ]
7 * Automatic snapshot from revision 140 (ubuntu-unity/next)12 * Automatic snapshot from revision 140 (ubuntu-unity/next)
813
9 -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 01 May 2013 07:53:27 +000014 -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 01 May 2013 07:53:27 +0000
15=======
16 [ Ubuntu daily release ]
17 * Automatic snapshot from revision 140 (ubuntu-unity/next)
18
19 -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 01 May 2013 15:32:52 +0000
20>>>>>>> MERGE-SOURCE
1021
11libsignon-glib (1.9-0ubuntu1) raring; urgency=low22libsignon-glib (1.9-0ubuntu1) raring; urgency=low
1223

Subscribers

People subscribed via source and target branches

to all changes: