merge proposals in lp: question on diff metadata

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Francis J. Lacoste wrote:
> The "has conflicts" thing is a bug: 
> 
> https://bugs.launchpad.net/launchpad-code/+bug/515775
> 
> The fix be rolled-out at the end of the month.

However, it's already on code.edge.launchpad.net, which is why John
doesn't see that.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkt0ZsQACgkQ0F+nu1YWqI3WfgCfaEM5HDpIoB9eAiFKRwGKWrjM
Y5sAnj/Ym3WqEk1i1ThybcN/FFAmfDDI
=e5lD
-----END PGP SIGNATURE-----