Merge lp:~nicolozilio/software-center/lp842706 into lp:software-center
Proposed by
Nicolò Zilio
Status: | Rejected |
---|---|
Rejected by: | dobey |
Proposed branch: | lp:~nicolozilio/software-center/lp842706 |
Merge into: | lp:software-center |
Diff against target: |
62 lines (+23/-11) 1 file modified
softwarecenter/ui/gtk3/widgets/searchentry.py (+23/-11) |
To merge this branch: | bzr merge lp:~nicolozilio/software-center/lp842706 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Kiwinote | Needs Fixing | ||
dobey | Needs Fixing | ||
Michael Vogt | Pending | ||
Review via email: mp+142008@code.launchpad.net |
Description of the change
Make a mistake during resolving the conflict.
This is a new branch with all updated
To post a comment you must log in.
Unmerged revisions
- 3287. By Nicolò Zilio
-
Updated debian/chagelog & bugfix code
- 3286. By Nicolò Zilio
-
Updated debian/chagelog & bugfix code
- 3285. By Nicolò Zilio
-
Updated debian/chagelog
- 3284. By Nicolò Zilio
-
*lp:~nicolozilio/software-center/lp842706:
- fix claning bug on SearchEntry.py (LP: #842706)
Hi Nicolo, can you please sign the Contributor Agreement by filling the on-line form at http:// www.canonical. com/contributor s and list the Canonical Contact as Roberto Alsina so that we may be able to accept patches from you?
Also, please remove the changes to debian/changelog in your branches, as we'll add them when we release, changing them in proposals like this creates unnecessary conflicts, and the version string and your e-mail address are not valid, there is a missing space character between the asterisk and text of that line, and you don't need to list your name twice. The [Name] entries are only used when someone else is listing the changes in the package.
Thanks.