Merge lp:~aaronhoneycutt/ubiquity-slideshow-ubuntu/vivid into lp:ubiquity-slideshow-ubuntu
Proposed by
Aaron Honeycutt
Status: | Merged |
---|---|
Merged at revision: | 685 |
Proposed branch: | lp:~aaronhoneycutt/ubiquity-slideshow-ubuntu/vivid |
Merge into: | lp:ubiquity-slideshow-ubuntu |
Diff against target: |
20 lines (+4/-0) (has conflicts) 1 file modified
slideshows/kubuntu/slides/welcome.html (+4/-0) Conflict adding file slideshows/kubuntu/slides/screenshots. Moved existing file to slideshows/kubuntu/slides/screenshots.moved. Text conflict in slideshows/kubuntu/slides/welcome.html |
To merge this branch: | bzr merge lp:~aaronhoneycutt/ubiquity-slideshow-ubuntu/vivid |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Adolfo Jayme Barrientos (community) | Needs Fixing | ||
Ubiquity Slideshow | Pending | ||
Review via email: mp+254846@code.launchpad.net |
Description of the change
Fixed missing icon on first slide (Welcome slide)
To post a comment you must log in.
Please fix conflicts and revert the changes in permissions.