Merge lp://staging/~bbaqar/charms/bundles/plumgrid-ons/bundle into lp://staging/~plumgrid-team/charms/bundles/plumgrid-ons/bundle
Proposed by
Bilal Baqar
| Status: | Merged |
|---|---|
| Merged at revision: | 6 |
| Proposed branch: | lp://staging/~bbaqar/charms/bundles/plumgrid-ons/bundle |
| Merge into: | lp://staging/~plumgrid-team/charms/bundles/plumgrid-ons/bundle |
| Diff against target: |
65 lines (+10/-6) (has conflicts) 1 file modified
bundle.yaml (+10/-6) Text conflict in bundle.yaml |
| To merge this branch: | bzr merge lp://staging/~bbaqar/charms/bundles/plumgrid-ons/bundle |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Bilal Baqar | Approve | ||
|
Review via email:
|
|||
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Fix conflicts