Merge lp://qastaging/drizzle/7.0 into lp://qastaging/drizzle
Proposed by
Chaz
| Status: | Merged |
|---|---|
| Merge reported by: | Chaz |
| Merged at revision: | not available |
| Proposed branch: | lp://qastaging/drizzle/7.0 |
| Merge into: | lp://qastaging/drizzle |
| Diff against target: |
20 lines (+11/-0) (has conflicts) 1 file modified
plugin/haildb/plugin.ini.OTHER (+11/-0) Conflict adding files to plugin/haildb. Created directory. Conflict because plugin/haildb is not versioned, but has versioned children. Versioned directory. Contents conflict in plugin/haildb/plugin.ini |
| To merge this branch: | bzr merge lp://qastaging/drizzle/7.0 |
| Related bugs: | |
| Related blueprints: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Drizzle Trunk | Pending | ||
|
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
