Merge lp:~jml/launchpad/stop-the-conflict into lp:launchpad/db-devel
Proposed by
Jonathan Lange
| Status: | Merged |
|---|---|
| Approved by: | Jonathan Lange |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 10302 |
| Proposed branch: | lp:~jml/launchpad/stop-the-conflict |
| Merge into: | lp:launchpad/db-devel |
| Diff against target: | 0 lines |
| To merge this branch: | bzr merge lp:~jml/launchpad/stop-the-conflict |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jonathan Lange (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Merge stable, resolving conflict by unioning changes.
Description of the change
Resolve the conflict.
To post a comment you must log in.
Revision history for this message
| Jonathan Lange (jml) | # |
review:
Approve
