[Intl] fix bad merge
This commit is contained in:
parent
fff1fdee1f
commit
536266cea3
@ -585,7 +585,7 @@ abstract class IntlDateFormatter
|
||||
*
|
||||
* @return \DateTime
|
||||
*/
|
||||
protected function createDateTime(int $timestamp)
|
||||
protected function createDateTime(string $timestamp)
|
||||
{
|
||||
$dateTime = \DateTime::createFromFormat('U', $timestamp);
|
||||
$dateTime->setTimezone($this->dateTimeZone);
|
||||
|
Reference in New Issue
Block a user