Merge conflict between stable and db-devel
Bug #487445 reported by
Jeroen T. Vermeulen
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Launchpad itself |
Fix Released
|
Critical
|
Jeroen T. Vermeulen | ||
Bug Description
db-devel and stable have conflicting changes at the very end of lib/canonical/
Looks like Salgado turned the "requires" section into proper JSON, whereas Henning added dependencies.
Related branches
lp:~jtv/launchpad/bug-487445
- Henning Eggers (community): Approve (code)
-
Diff: 15 lines (+5/-3)1 file modifiedlib/canonical/launchpad/javascript/translations/translations.js (+5/-3)
Revision history for this message
| Jeroen T. Vermeulen (jtv) wrote | #1 |
| Changed in rosetta: | |
| status: | In Progress → Invalid |
Revision history for this message
| Jeroen T. Vermeulen (jtv) wrote | #2 |
| Changed in rosetta: | |
| status: | Invalid → In Progress |
Revision history for this message
| Ursula Junque (ursinha) wrote A commit mentioned this bug | #3 |
| Changed in rosetta: | |
| status: | In Progress → Fix Committed |
| tags: | added: qa-needstesting |
| tags: |
added: qa-ok removed: qa-needstesting |
Revision history for this message
| Данило Шеган (danilo) wrote | #4 |
| Changed in rosetta: | |
| status: | Fix Committed → Fix Released |
To post a comment you must log in.
Turns out Stuart was ahead of me in fixing this.