Attempt to merge into lp:maas/1.8 failed due to conflicts:
text conflict in src/maasserver/static/css/maas-styles.css text conflict in src/maasserver/static/partials/node-details.html
« Back to merge proposal
Attempt to merge into lp:maas/1.8 failed due to conflicts:
text conflict in src/maasserver/ static/ css/maas- styles. css static/ partials/ node-details. html
text conflict in src/maasserver/