Attempt to merge into lp:juju-core failed due to conflicts:
text conflict in state/api/client.go text conflict in state/api/params/params.go text conflict in state/apiserver/client/client.go text conflict in state/apiserver/client/client_test.go
« Back to merge proposal
Attempt to merge into lp:juju-core failed due to conflicts:
text conflict in state/api/client.go params/ params. go /client/ client. go /client/ client_ test.go
text conflict in state/api/
text conflict in state/apiserver
text conflict in state/apiserver