Merge ~gsilvapt/kubuntu-packaging/+git/lskat:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/lskat:kubuntu_unstable
Proposed by
Gustavo Silva
on 2017-06-12
| Status: | Merged |
|---|---|
| Merged at revision: | 7e15db0655ba6b4de960edb56892b66f0d4aeb64 |
| Proposed branch: | ~gsilvapt/kubuntu-packaging/+git/lskat:kubuntu_unstable |
| Merge into: | ~kubuntu-packagers/kubuntu-packaging/+git/lskat:kubuntu_unstable |
| Diff against target: |
30 lines (+17/-2) 1 file modified
debian/control (+17/-2) |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Kubuntu Packagers | 2017-06-12 | Pending | |
|
Review via email:
|
|||
Description of the Change
Fix for building dependencies in KF5.
To post a comment you must log in.
| Clive Johnston (clivejo) wrote : | # |
| Gustavo Silva (gsilvapt) wrote : | # |
I have no clue what happened here but there was definitely something I did with Git that caused this. My branch was I commit behind and when I pulled, I had those marks.
Oh well, I think this fixes the issue.
Sorry!
| Gustavo Silva (gsilvapt) wrote : | # |
Now it builds locally: https:/

There are merge markers in this commit, please resolve the conflict