Attempt to merge into lp:loco-team-portal failed due to conflicts:
text conflict in loco_directory/media/css/styles.css
« Back to merge proposal
Attempt to merge into lp:loco-team-portal failed due to conflicts:
text conflict in loco_directory/ media/css/ styles. css