From dc71fd8df0595a9436086451dbb435bcbea31e94 Mon Sep 17 00:00:00 2001
From: ovclas <ovclas@gmail.com>
Date: Thu, 17 May 2012 06:29:43 +0000
Subject: [PATCH] merge error fix

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10718 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 classes/xml/xmlquery/tags/column/SelectColumnTag.class.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/classes/xml/xmlquery/tags/column/SelectColumnTag.class.php b/classes/xml/xmlquery/tags/column/SelectColumnTag.class.php
index 8193c9ca3..22153d346 100644
--- a/classes/xml/xmlquery/tags/column/SelectColumnTag.class.php
+++ b/classes/xml/xmlquery/tags/column/SelectColumnTag.class.php
@@ -26,7 +26,6 @@
 				$this->alias = $column->attrs->alias;
 				$this->click_count = $column->attrs->click_count;
 			}
-			}
 		}
 		
 		function getExpressionString(){