Merge lp:~aaronhoneycutt/ubiquity-slideshow-ubuntu/vivid into lp:ubiquity-slideshow-ubuntu

Proposed by Aaron Honeycutt on 2015-03-31
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
Reviewer Review Type Date Requested Status
Adolfo Jayme (community) Needs Fixing on 2015-03-31
Ubiquity Slideshow 2015-03-31 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.
Adolfo Jayme (fitojb) wrote :

Please fix conflicts and revert the changes in permissions.

review: Needs Fixing
682. By Aaron Honeycutt on 2015-03-31

Fixed conflicts and permisson changes

683. By Aaron Honeycutt on 2015-03-31

Fixed all the permissons this time by hand

684. By Aaron Honeycutt on 2015-03-31

fixed more permissons

685. By Aaron Honeycutt on 2015-04-01

fixed even more permissons

686. By Aaron Honeycutt on 2015-04-01

fixed even even more permissons

Aaron Honeycutt (aaronhoneycutt) wrote :

Fixed them all Adolfo.

687. By Aaron Honeycutt on 2015-04-01

Fix ALL permissions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'slideshows/kubuntu/slides/icons/system-help.png'
2Binary files slideshows/kubuntu/slides/icons/system-help.png 1970-01-01 00:00:00 +0000 and slideshows/kubuntu/slides/icons/system-help.png 2015-04-01 11:50:20 +0000 differ
3=== added file 'slideshows/kubuntu/slides/icons/system-users.png'
4Binary files slideshows/kubuntu/slides/icons/system-users.png 1970-01-01 00:00:00 +0000 and slideshows/kubuntu/slides/icons/system-users.png 2015-04-01 11:50:20 +0000 differ
5=== added directory 'slideshows/kubuntu/slides/screenshots'
6=== renamed directory 'slideshows/kubuntu/slides/screenshots' => 'slideshows/kubuntu/slides/screenshots.moved'
7=== added file 'slideshows/kubuntu/slides/screenshots/kubuntu-15.04-desktop_full.png'
8Binary files slideshows/kubuntu/slides/screenshots/kubuntu-15.04-desktop_full.png 1970-01-01 00:00:00 +0000 and slideshows/kubuntu/slides/screenshots/kubuntu-15.04-desktop_full.png 2015-04-01 11:50:20 +0000 differ
9=== modified file 'slideshows/kubuntu/slides/welcome.html'
10--- slideshows/kubuntu/slides/welcome.html 2015-03-27 12:21:00 +0000
11+++ slideshows/kubuntu/slides/welcome.html 2015-04-01 11:50:20 +0000
12@@ -17,4 +17,8 @@
13 </div>
14 </div>
15
16+<<<<<<< TREE
17 <img class="screenshot" src="screenshots/kubuntu-15.04-desktop.png"/>
18+=======
19+<img class="icon" src="icons/kubuntu-logo_15.04.png"/>
20+>>>>>>> MERGE-SOURCE

Subscribers

People subscribed via source and target branches