Merge lp://staging/~attente/indicator-keyboard/disable-flaky-test into lp://staging/indicator-keyboard
Proposed by
Rhykim scottie
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~attente/indicator-keyboard/disable-flaky-test |
| Merge into: | lp://staging/indicator-keyboard |
| Diff against target: |
37 lines (+20/-0) (has conflicts) 1 file modified
tests/main.vala (+20/-0) Text conflict in tests/main.vala |
| To merge this branch: | bzr merge lp://staging/~attente/indicator-keyboard/disable-flaky-test |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Dmitry Shachnev | Needs Information | ||
|
Review via email:
|
|||
To post a comment you must log in.
Unmerged revisions
- 100. By William Hua
-
Disable flaky test.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
You are trying to merge a very outdated branch from 2013 which has a merge conflict. Why?