Fwd: A wrong merge in KDevelop git

[Milian Wolff]

Sigh, looks like after effects from my recent git mess-up are popping up:


----------  Forwarded Message  ----------

Subject: A wrong merge in KDevelop git
Date: Thursday 19 April 2012, 23:34:39
From: Alexey Morozov <morozov at gmail.com>
To: Milian Wolff <mail at milianw.de>

Hi!

It seems, that script kiddy made a wrong
merge 46dc789a6af992b929f510c420f0be922a5c2314 in the KDevelop git repo.
Now both master and 4.3 branches contain sources of the development
(4.3.60) version of KDevelop.

Best regards,
Alexey Morozov
-----------------------------------------

Does anyone know what to do now?

Bye

-- 
Milian Wolff
mail at milianw.de
http://milianw.de
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part.
URL: <http://mail.kde.org/pipermail/kdevelop-devel/attachments/20120419/ad61b2cb/attachment.sig>