Fixed duplicated merge.

12 years ago · a87e64c650
1 changed files with 0 additions and 4 deletions
--- 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();