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
3 lines
63 B
Plaintext
3 lines
63 B
Plaintext
debian/bin/* /usr/share/lxqt-build-tools/bin
|
|
debian/usr/* /usr
|