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
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-05-01 07:53:28 +0000
3+++ debian/changelog 2013-05-01 16:32:28 +0000
4@@ -1,12 +1,23 @@
5+<<<<<<< TREE
6 libsignon-glib (1.9daily13.05.01.1ubuntu.unity.next-0ubuntu1) raring; urgency=low
7+=======
8+libsignon-glib (1.9daily13.05.01.2ubuntu.unity.next-0ubuntu1) raring; urgency=low
9+>>>>>>> MERGE-SOURCE
10
11 [ Ken VanDine ]
12 * Automatic snapshot from revision 138 (bootstrap)
13
14+<<<<<<< TREE
15 [ Ubuntu daily release ]
16 * Automatic snapshot from revision 140 (ubuntu-unity/next)
17
18 -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 01 May 2013 07:53:27 +0000
19+=======
20+ [ Ubuntu daily release ]
21+ * Automatic snapshot from revision 140 (ubuntu-unity/next)
22+
23+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 01 May 2013 15:32:52 +0000
24+>>>>>>> MERGE-SOURCE
25
26 libsignon-glib (1.9-0ubuntu1) raring; urgency=low
27

Subscribers

People subscribed via source and target branches

to all changes: