[Intl] fix bad merge
MODIFY
DateFormatter/IntlDateFormatter.php
DateFormatter/IntlDateFormatter.php
@@ -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);

[Intl] fix bad merge