Fixed duplicated merge.

a87e64c6 · Qiang Xue · 71897b4b · a87e64c6
Commit a87e64c6 authored May 10, 2013 by Qiang Xue
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

Application.php yii/base/Application.php +0 -4

No files found.
--- 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();