[Mailer] fix merge

symfony · Feb 4, 2020 · abeee5f · abeee5f
1 parent 88b4579
commit abeee5f
Showing 1 changed file with 0 additions and 71 deletions.
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Http/MandrillTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Http/MandrillTransport.php