Attempt to merge into lp:webdm failed due to conflicts:
duplicate in gadget.moved text conflict in snappy/common_test.go text conflict in snappy/converge.go duplicate in snappy/snapd_client.go.moved
« Back to merge proposal
Attempt to merge into lp:webdm failed due to conflicts:
duplicate in gadget.moved common_ test.go snapd_client. go.moved
text conflict in snappy/
text conflict in snappy/converge.go
duplicate in snappy/