From a87e64c6500b16f2e59e1c60845ada880f4d40b5 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Fri, 10 May 2013 22:40:26 -0400
Subject: [PATCH] Fixed duplicated merge.

---
 yii/base/Application.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/yii/base/Application.php b/yii/base/Application.php
index 6e82e9a..fb9a6c1 100644
--- a/yii/base/Application.php
+++ b/yii/base/Application.php
@@ -92,10 +92,6 @@ class Application extends Module
 			$this->setTimeZone('UTC');
 		} 
 
-		if (!ini_get('date.timezone')) {
-			$this->setTimeZone('UTC');
-		}
-
 		$this->registerErrorHandlers();
 		$this->registerCoreComponents();