Attempt to merge into lp:loco-directory failed due to conflicts:
text conflict in loco_directory/templates/teams/team_detail.html
« Back to merge proposal
Attempt to merge into lp:loco-directory failed due to conflicts:
text conflict in loco_directory/ templates/ teams/team_ detail. html