From 98e88cd0a9607d8e5c33778371e8c0508f75f86d Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 29 Jan 2024 16:11:35 +0100
Subject: [PATCH] Fix merge

---
 Tests/Mime/NotificationEmailTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Tests/Mime/NotificationEmailTest.php b/Tests/Mime/NotificationEmailTest.php
index e7ac5b13..979f2791 100644
--- a/Tests/Mime/NotificationEmailTest.php
+++ b/Tests/Mime/NotificationEmailTest.php
@@ -142,7 +142,7 @@ public function testContext()
             'action_url' => null,
             'markdown' => false,
             'raw' => false,
-            'footer_text' => 'Notification e-mail sent by Symfony',
+            'footer_text' => 'Notification email sent by Symfony',
             'some' => 'context',
         ], $email->getContext());
 
@@ -158,7 +158,7 @@ public function testContext()
             'action_url' => null,
             'markdown' => false,
             'raw' => false,
-            'footer_text' => 'Notification e-mail sent by Symfony',
+            'footer_text' => 'Notification email sent by Symfony',
             'some' => 'context',
             'foo' => 'bar',
         ], $email->getContext());
@@ -173,7 +173,7 @@ public function testContext()
             'action_url' => 'Action URL',
             'markdown' => false,
             'raw' => false,
-            'footer_text' => 'Notification e-mail sent by Symfony',
+            'footer_text' => 'Notification email sent by Symfony',
             'some' => 'context',
             'foo' => 'bar',
         ], $email->getContext());