[Fedora-spins] [spin-kickstarts: 2/2] Merge branch 'master' of ssh://git.fedorahosted.org/git/spin-kickstarts

[Christoph Wickert]

Am Mittwoch, den 09.03.2011, 13:54 +0000 schrieb Joerg Simon:
> commit 733e7a9f70d16534f409a945c115e4f56d957c98
> Merge: 6e18af0... 39dce77...
> Author: Joerg (kital) Simon <jsimon at fedoraproject.org>
> Date:   Wed Mar 9 14:54:23 2011 +0100
> 
>     Merge branch 'master' of ssh://git.fedorahosted.org/git/spin-kickstarts
> 
>  fedora-install-fedora.ks |    2 +-
>  fedora-live-kde.ks       |   16 +++++++-----
>  fedora-livecd-kde.ks     |   22 ++++++++--------
>  fedora-livecd-lxde.ks    |   58 +++++++++++++++++++++++----------------------
>  4 files changed, 51 insertions(+), 47 deletions(-)

Hi Jörg,

to avoid changes like these, please remember 'git pull' before you work
on your local copy. If you have already worked on it while it was out of
date, then commit to your staging area and 'git pull --rebase' before
you push your changes to the repository.

Regards,
Christoph

P.S.: You might also want to read my message about commit messages, see
http://lists.fedoraproject.org/pipermail/spins/2011-February/001733.html