# HG changeset patch
# User eldar
# Date 1245525441 0
# Node ID d66bbb9a5053e1deed1061b93a12af9f4b9001aa
# Parent  ae06da58ec255b655ad74c09784c04b1857a5df6
ups

diff -r ae06da58ec25 -r d66bbb9a5053 qt/QGlobal.d
--- a/qt/QGlobal.d	Sat Jun 20 19:14:29 2009 +0000
+++ b/qt/QGlobal.d	Sat Jun 20 19:17:21 2009 +0000
@@ -401,15 +401,9 @@
 
 void qSwap(T)(ref T value1, ref T value2)
 {
-<<<<<<< .mine
-    const T.nativeId t = value1.nativeId;
-    value1.nativeId = value2.nativeId;
-    value2.nativeId = t;
-=======
     T t = value1;
     value1 = value2;
     value2 = t;
->>>>>>> .r170
 }
 
 /*