Merge lp://qastaging/~brendan-donegan/checkbox/remove_conflicts into lp://qastaging/~checkbox-dev/checkbox/checkbox-packaging
Proposed by
Brendan Donegan
| Status: | Merged |
|---|---|
| Approved by: | Zygmunt Krynicki |
| Approved revision: | 58 |
| Merged at revision: | 58 |
| Proposed branch: | lp://qastaging/~brendan-donegan/checkbox/remove_conflicts |
| Merge into: | lp://qastaging/~checkbox-dev/checkbox/checkbox-packaging |
| Diff against target: |
11 lines (+0/-1) 1 file modified
debian/control (+0/-1) |
| To merge this branch: | bzr merge lp://qastaging/~brendan-donegan/checkbox/remove_conflicts |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Zygmunt Krynicki (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
As discussed on IRC, checkbox-gui doesn't need Conflicts and there are places where this may cause problems so lets remove that stanza.
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
+1