Remove broken result of an automatic merge resolution.
authorJędrzej Nowacki <jedrzej.nowacki@digia.com>
Mon, 14 Jan 2013 15:10:56 +0000 (16:10 +0100)
committerLars Knoll <lars.knoll@digia.com>
Sun, 20 Jan 2013 14:48:55 +0000 (15:48 +0100)
commit4e3433f2b7d98f081ce9a7da3e71943a63e9e3da
tree8e659b9ab9858c7427201fa20910d522e769a353
parent25563eaab1ed5f9762075c6beba3efefbb847f1d
Remove broken result of an automatic merge resolution.

Change-Id: Idc86a0cc2175c11e5b40f9c28e294bd0a7d033eb
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
qv4mm.h