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.
_______________________________________________
Mailing list: https://launchpad.net/~launchpad-reviewers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~launchpad-reviewers
More help : https://help.launchpad.net/ListHelp