[Kstars-devel] KDE/kdeedu/kstars/kstars [POSSIBLY UNSAFE]

[Khudyakov Alexey]

В сообщении от Четверг 13 августа 2009 20:54:42 автор Prakash Mohan написал:
> Yeah, I've found the conflicting revisions, they are the ones from
> revision 1010892-1010898.
> I've merged everything till 1010891. So if you could revert these for
> now, I'll do my merge and you can commit them after that.
> Sorry if its too much trouble. I should have told the list about my
> merger earlier.

I've reverted to revision 1010891. Is this OK?