From 36466a3ab5a812a07f38e629290c24d311edb162 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 6 Aug 2019 09:38:50 +0200
Subject: [PATCH] fix merge

---
 .../Form/Tests/Extension/Core/Type/TimezoneTypeTest.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimezoneTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimezoneTypeTest.php
index e205529fe8..3f34b2eb5e 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimezoneTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimezoneTypeTest.php
@@ -69,7 +69,7 @@ class TimezoneTypeTest extends BaseTypeTest
         $form->submit('Europe/Saratov');
 
         $this->assertEquals(new \DateTimeZone('Europe/Saratov'), $form->getData());
-        $this->assertStringContainsString('Europe/Saratov', $form->getConfig()->getAttribute('choice_list')->getValues());
+        $this->assertContainsEquals('Europe/Saratov', $form->getConfig()->getAttribute('choice_list')->getValues());
     }
 
     /**