kubuntu-packaging

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

  1. Git
  2. lp:~tsimonq2/kubuntu-packaging/+git/kubuntu-cantor
  3. kubuntu_unstable
  4. Merge into kubuntu_unstable
Proposed by Simon Quigley
Status: Merged
Merged at revision: 88294428ad32879f994e1ebcc81fbfbc8bb74e46
Proposed branch: ~tsimonq2/kubuntu-packaging/+git/kubuntu-cantor:kubuntu_unstable
Merge into: ~kubuntu-packagers/kubuntu-packaging/+git/cantor:kubuntu_unstable
Diff against target: 0 lines
Reviewer Review Type Date Requested Status
Kubuntu Packagers Pending
Review via email: mp+300990@code.launchpad.net

Description of the change

This fixes the merge conflict in the debian/control file. (kubuntu_stable -> kubuntu_unstable)

To post a comment you must log in.
Revision history for this message
Clive Johnston (clivejo) wrote :

This doesn't look right to me, why is the description being removed?

~tsimonq2/kubuntu-packaging/+git/kubuntu-cantor:kubuntu_unstable updated
ff3d034... by Simon Quigley

Merge branch 'kubuntu_unstable' of git+ssh://git.launchpad.net/~tsimonq2/kubuntu-packaging/+git/kubuntu-cantor into kubuntu_unstable

Preview Diff

Empty

Subscribers

People subscribed via source and target branches