dialer-app

Merge lp:~phablet-team/dialer-app/tweak_changelog into lp:dialer-app

  1. tweak_changelog
  2. Merge into trunk
Proposed by Gustavo Pichorim Boiko
Status: Work in progress
Proposed branch: lp:~phablet-team/dialer-app/tweak_changelog
Merge into: lp:dialer-app
Diff against target: 23 lines (+9/-0) (has conflicts)
1 file modified
debian/changelog (+9/-0)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~phablet-team/dialer-app/tweak_changelog
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team Pending
Review via email: mp+316842@code.launchpad.net

This proposal supersedes a proposal from 2017-02-09.

Commit message

Tweak changelog to build on vivid.

Description of the change

Tweak changelog to build on vivid.

To post a comment you must log in.

Unmerged revisions

555. By Gustavo Pichorim Boiko

Tweak changelog to build on vivid.

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 2016-12-09 15:35:06 +0000
3+++ debian/changelog 2017-02-09 13:18:16 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 dialer-app (0.1+17.04.20161209-0ubuntu1) zesty; urgency=medium
7
8 * Make use of 'ubuntu-app-platform' snap interface.
9@@ -28,6 +29,14 @@
10
11 -- Gustavo Pichorim Boiko <gustavo.boiko@canonical.com> Thu, 20 Oct 2016 15:15:55 +0000
12
13+=======
14+dialer-app (0.1.1-0ubuntu) vivid; urgency=medium
15+
16+ * Tweak changelog to build on vivid.
17+
18+ -- Gustavo Pichorim Boiko <gustavo.boiko@canonical.com> Thu, 09 Feb 2017 10:28:09 -0200
19+
20+>>>>>>> MERGE-SOURCE
21 dialer-app (0.1+16.10.20160825.2-0ubuntu1) yakkety; urgency=medium
22
23 [ Florian Boucault ]

Subscribers

People subscribed via source and target branches