Merge lp:~bfiller/telephony-service/conflicts-replaces-phone-app into lp:telephony-service
Proposed by
Bill Filler
| Status: | Merged |
|---|---|
| Approved by: | Gustavo Pichorim Boiko |
| Approved revision: | 734 |
| Merged at revision: | 736 |
| Proposed branch: | lp:~bfiller/telephony-service/conflicts-replaces-phone-app |
| Merge into: | lp:telephony-service |
| Diff against target: |
12 lines (+2/-0) 1 file modified
debian/control (+2/-0) |
| To merge this branch: | bzr merge lp:~bfiller/telephony-service/conflicts-replaces-phone-app |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot | continuous-integration | Approve | |
| Gustavo Pichorim Boiko (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Add Conflicts and Replaces phone-app such that both can't be installed at the same time
Description of the change
Add Conflicts and Replaces phone-app such that both can't be installed at the same time
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) | # |
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:734
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://