Re: [Fedora-spins] [spin-kickstarts] #10: Please merge fedora-livecd-kde.ks and fedora-livecd-kde-de_DE.ks into F-10 branch

: Sorry this was my bad I guess (I am still learning/grappling with git a bit - perhaps someone could point me at some clues about handling merge conflicts more smoothly?). "I could have sworn" I pushed the rest of my input-method cleanup patch a couple of days ago but seems I didn't <sigh/>... I will still do that for HEAD anyway but for F-10 since we are now into the freeze maybe it is better just to revert the "+@input-methods" I committed Monday to fedora-live-base.ks? http://git.fedorahosted.org/git/spin-kickstarts.git?p=spin-kickstarts.git... Otherwise large parts of my patch to all the local spins will certainly be needed for F10. Let me know what you prefer anyway... Jens