From 536266cea3d8e85f5d4909305da40c6abf2ef8c7 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 27 May 2021 08:39:45 +0200
Subject: [PATCH] [Intl] fix bad merge

---
 src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php b/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php
index 08e5d02909..c6610085e5 100644
--- a/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php
+++ b/src/Symfony/Component/Intl/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);