Merge lp://qastaging/~vjsamuel/drizzle/fix-bug-715789 into lp://qastaging/drizzle/7.0
Proposed by
Vijay Samuel
| Status: | Superseded | ||||
|---|---|---|---|---|---|
| Proposed branch: | lp://qastaging/~vjsamuel/drizzle/fix-bug-715789 | ||||
| Merge into: | lp://qastaging/drizzle/7.0 | ||||
| Diff against target: |
74 lines (+32/-32) 1 file modified
tests/include.am (+32/-32) |
||||
| To merge this branch: | bzr merge lp://qastaging/~vjsamuel/drizzle/fix-bug-715789 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Lee Bieber (community) | Needs Fixing | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2011-02-10.
To post a comment you must log in.
Revision history for this message
| Lee Bieber (kalebral-deactivatedaccount) wrote | # |
review:
Needs Fixing
Unmerged revisions
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
please re-merge it has conflicts when merging with your other branch
Text conflict in tests/include.am