Merge branch 'master' of github.com:robmcvey/cakephp-timezone

Conflicts: Test/Case/View/Helper/TimezoneHelperTest.php
robmcvey · May 12, 2014 · a186f18 · a186f18
2 parents c21fc2f + 2c0c3d7
commit a186f18
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/View/Helper/TimezoneHelper.php b/View/Helper/TimezoneHelper.php
@@ -425,4 +425,3 @@ protected function _formattedTimeZoneOptions() {
 	}
 
 }
-