I've included the changes from https://code.launchpad.net/~bryanfraschetti/ubuntu/+source/landscape-client/+git/landscape-client/+merge/483097 in this MR to resolve the conflict.
« Back to merge proposal
I've included the changes from https:/ /code.launchpad .net/~bryanfras chetti/ ubuntu/ +source/ landscape- client/ +git/landscape- client/ +merge/ 483097 in this MR to resolve the conflict.