fix conflict marker in comment
authordaniel <daniel.kinzler@wikimedia.de>
Mon, 12 Nov 2012 13:37:32 +0000 (14:37 +0100)
committerdaniel <daniel.kinzler@wikimedia.de>
Mon, 12 Nov 2012 13:37:32 +0000 (14:37 +0100)
commitd4d929b352ed4f0c6d8d1febe69f9aca9253209d
treee06cc9aa998fa71358975d01259c6fe9dbe847b7
parent6a916e75a3badc47f5e278aff20b8bfd52290a00
fix conflict marker in comment

Change-Id: I23e9593890ab5899e10d8eb61f63f38fb98072a7
includes/Revision.php