launchpad-reviewers team mailing list archive

[noreply@xxxxxxxxxxxxx]

The proposal to merge lp:~cjwatson/launchpad/conflict-marker-test-git into lp:launchpad has been updated.

    Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/conflict-marker-test-git/+merge/373153
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/conflict-marker-test-git into lp:launchpad.