It is entirely possible this is what happened. Many screenshots were missing in chapter two (and still are, but I've already committed to getting the rest of the shots up by Wednesday). I simply followed the file names as prescribed in the "missing screenshot" box, grabbed the screenshot, named the file to match what was indicated, put them in the /screenshot folder, committed, and pushed. While I'm not sure how I would have overwritten what may have already been there, it's entirely possible this is what happened.
Odd that you had a conflict!? I compiled with no issues, then committed with no conflicts. What can I do to resolve this conflict you are seeing? Let me know. On Tue, May 29, 2012 at 1:00 AM, Hannie Dumoleyn < lafeber-dumole...@zonnet.nl> wrote: > Hi Jim, > The last revision I pulled (60) gave me a conflict: SystemSettings.png. > May I ask if you replaced the screenshot I made and pushed by another one? > Greets, > Hannie > > Op 29-05-12 05:14, Jim Connett schreef: > > Hello everyone! > > I incorporated Sayantan's HUD feature into Chapter 2. I also got MOST, > but not ALL of the screenshots done for Chapter 2. I hope to have these > completed and pushed by Wednesday evening. I'm also editing as I go, so I > do hope that the push on Wednesday evening will be a 'virtually completed' > Chapter 2...of course, another set of eyes on it certainly would be welcome. > > On Mon, May 28, 2012 at 8:31 AM, Hannie Dumoleyn < > lafeber-dumole...@zonnet.nl> wrote: > >> Op 28-05-12 17:17, Hannie Dumoleyn schreef: >> >> Op 28-05-12 00:08, John Cave schreef: >> >> I have had a look through the nautilus to end of chapter section, and >> made some changes, including that you can now change the size of launcher >> icons. Where do I need to put it? >> >> John C >> >> >> _______________________________________________ >> Mailing list: https://launchpad.net/~ubuntu-manual >> Post to : ubuntu-manual@lists.launchpad.net >> Unsubscribe : https://launchpad.net/~ubuntu-manual >> More help : https://help.launchpad.net/ListHelp >> >> Hi John, >> Thanks for doing so. Good idea, to add "launcher icon size". There is a >> screenshot, page 32 in my manual.pdf, with the "Launcer icon size" slider >> at the bottom, but that screenshot is about Appearance preferences. You may >> add the text wherever you think is the best place. >> Regards, >> Hannie >> >> >> Sorry, I misunderstood your e-mail. Patrick already answered how to >> push it to Launchpad. If you are not sure how to do it, please send >> ubuntu-desktop.tex to me and I will push it for you. >> Regards, >> Hannie >> >> >> _______________________________________________ >> Mailing list: https://launchpad.net/~ubuntu-manual >> Post to : ubuntu-manual@lists.launchpad.net >> Unsubscribe : https://launchpad.net/~ubuntu-manual >> More help : https://help.launchpad.net/ListHelp >> >> > >
_______________________________________________ Mailing list: https://launchpad.net/~ubuntu-manual Post to : ubuntu-manual@lists.launchpad.net Unsubscribe : https://launchpad.net/~ubuntu-manual More help : https://help.launchpad.net/ListHelp
