kubuntu-packaging

Merge ~tsimonq2/kubuntu-packaging/+git/kubuntu-ark:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/ark:kubuntu_unstable

  1. Git
  2. lp:~tsimonq2/kubuntu-packaging/+git/kubuntu-ark
  3. kubuntu_unstable
  4. Merge into kubuntu_unstable
Proposed by Simon Quigley
Status: Merged
Merged at revision: 75da49c99cca0ee27e378a7fbc775106c7d8f760
Proposed branch: ~tsimonq2/kubuntu-packaging/+git/kubuntu-ark:kubuntu_unstable
Merge into: ~kubuntu-packagers/kubuntu-packaging/+git/ark:kubuntu_unstable
Diff against target: 18 lines (+2/-1)
1 file modified
debian/changelog (+2/-1)
Reviewer Review Type Date Requested Status
Kubuntu Packagers Pending
Review via email: mp+300988@code.launchpad.net

Description of the change

This pull request fixes the merge conflicts in the debian/changelog file.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index daf7374..b694ce0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
1ark (4:16.04.3-0ubuntu1) UNRELEASED; urgency=medium1ark (4:16.04.3a-0ubuntu1) UNRELEASED; urgency=medium
22
3 [ Scarlett Clark ]3 [ Scarlett Clark ]
4 * New upstream release4 * New upstream release
@@ -24,6 +24,7 @@ ark (4:16.04.3-0ubuntu1) UNRELEASED; urgency=medium
24 * New upstream release (16.04.2)24 * New upstream release (16.04.2)
25 * Fixing install file25 * Fixing install file
26 * New upstream release (16.04.3)26 * New upstream release (16.04.3)
27 * New respun upstream tarball, Ill call it 16.04.3a
2728
28 [ Simon Quigley ]29 [ Simon Quigley ]
29 * Fix the path for org.kde.ark.appdata.xml in the install file30 * Fix the path for org.kde.ark.appdata.xml in the install file

Subscribers

People subscribed via source and target branches