Compare changes
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
@@ -7,6 +7,8 @@ use Drupal\Core\Config\ConfigFactoryOverrideInterface;
@@ -90,6 +92,10 @@ class MailerConfigOverride implements ConfigFactoryOverrideInterface {