2e714bd117
Summary: Merge was stuck in merge-o-matic due to Diff3 conflict markers. Now resolved. Test Plan: check if this is indeed correct merge according to ubuntu standards. Reviewers: wxl, kc2bez Reviewed By: wxl, kc2bez Differential Revision: https://phab.lubuntu.me/D104
7 lines
109 B
Plaintext
7 lines
109 B
Plaintext
[DEFAULT]
|
|
debian-branch = debian/sid
|
|
upstream-branch = upstream/latest
|
|
pristine-tar = True
|
|
compression = xz
|
|
|