fix php-cs

szepczynski · szepczynski · commit 85a578eefd70 · 2020-08-17T11:31:39.000+02:00
diff --git a/src/Symfony/Component/Notifier/Transport.php b/src/Symfony/Component/Notifier/Transport.php
@@ -24,7 +24,10 @@
 use Symfony\Component\Notifier\Bridge\Smsapi\SmsapiTransportFactory;
 use Symfony\Component\Notifier\Bridge\Telegram\TelegramTransportFactory;
 use Symfony\Component\Notifier\Bridge\Twilio\TwilioTransportFactory;
+<<<<<<< HEAD
 use Symfony\Component\Notifier\Bridge\Zulip\ZulipTransportFactory;
+=======
+>>>>>>> fix php-cs
 use Symfony\Component\Notifier\Exception\UnsupportedSchemeException;
 use Symfony\Component\Notifier\Transport\Dsn;
 use Symfony\Component\Notifier\Transport\FailoverTransport;
