Code review comment for lp:~jtv/launchpad/bug-487445
Revision history for this message
| Jeroen T. Vermeulen (jtv) wrote | # |
© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
0e1f616
(Get the code!)
= Bug 487447 =
This resolves a merge conflict between two projects from the lazr-js sprint:
* Salgado made the "requires" sections JSON-compatible.
* Henning ajacified the import queue UI, adding to the "requires" section in the process.
A fix for the conflict has already landed, but it simply chose Salgado's change over Henning's—meaning that it will break the new import queue UI.
This branch combines the two fixes. There's some lint outside the affected area, but given that this is emergency conflict resolution I'm not going to throw in any drive-bys.
Jeroen