From ddb2d0158d636a028f905d551dd6d11ec2395e12 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 10 May 2021 16:55:18 +0200
Subject: [PATCH] fix merge

---
 src/Symfony/Component/Inflector/Tests/InflectorTest.php         | 1 +
 .../Component/String/Tests/Inflector/EnglishInflectorTest.php   | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/Symfony/Component/Inflector/Tests/InflectorTest.php b/src/Symfony/Component/Inflector/Tests/InflectorTest.php
index a8bf105b02..aa223c40bd 100644
--- a/src/Symfony/Component/Inflector/Tests/InflectorTest.php
+++ b/src/Symfony/Component/Inflector/Tests/InflectorTest.php
@@ -61,6 +61,7 @@ class InflectorTest extends TestCase
             ['crises', ['cris', 'crise', 'crisis']],
             ['criteria', ['criterion', 'criterium']],
             ['cups', 'cup'],
+            ['coupons', 'coupon'],
             ['data', 'data'],
             ['days', 'day'],
             ['discos', 'disco'],
diff --git a/src/Symfony/Component/String/Tests/Inflector/EnglishInflectorTest.php b/src/Symfony/Component/String/Tests/Inflector/EnglishInflectorTest.php
index 0cbcc3277d..2edeedfbd3 100644
--- a/src/Symfony/Component/String/Tests/Inflector/EnglishInflectorTest.php
+++ b/src/Symfony/Component/String/Tests/Inflector/EnglishInflectorTest.php
@@ -79,6 +79,7 @@ class EnglishInflectorTest extends TestCase
             ['focuses', ['focus', 'focuse', 'focusis']],
             ['formulae', 'formula'],
             ['formulas', 'formula'],
+            ['conspectuses', 'conspectus'],
             ['fungi', 'fungus'],
             ['funguses', ['fungus', 'funguse', 'fungusis']],
             ['garages', ['garag', 'garage']],
@@ -220,6 +221,7 @@ class EnglishInflectorTest extends TestCase
             ['focus', 'focuses'],
             ['foot', 'feet'],
             ['formula', 'formulas'], //formulae
+            ['conspectus', 'conspectuses'],
             ['fungus', 'fungi'],
             ['garage', 'garages'],
             ['goose', 'geese'],