From e5e62799cde71e9b3142dc798f138b99d9890f18 Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Thu, 29 Oct 2009 13:32:27 +1000
Subject: fix merge duplication

---
 src/gui/math3d/qvector3d.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/gui/math3d/qvector3d.cpp b/src/gui/math3d/qvector3d.cpp
index e17cbdf..9552e3a 100644
--- a/src/gui/math3d/qvector3d.cpp
+++ b/src/gui/math3d/qvector3d.cpp
@@ -45,7 +45,6 @@
 #include <QtCore/qmath.h>
 #include <QtCore/qvariant.h>
 #include <QtCore/qdebug.h>
-#include <QtCore/qvariant.h>
 
 QT_BEGIN_NAMESPACE
 
-- 
cgit v0.12