fix conflicts

itsd.one · itsd.one · commit 2ba25a966212 · 2020-08-08T16:18:58.000+03:00
diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php
@@ -199,7 +199,7 @@ public function trans(?string $id, array $parameters = [], string $domain = null
             return '';
         }
 
-        if(null === $domain){
+        if (null === $domain) {
             $parsed = explode('@', $id);
             $id = $parsed[0];
             $domain = $parsed[1] ?? 'messages';

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ public function trans(?string $id, array $parameters = [], string $domain = null`
`199`	`199`	`return '';`
`200`	`200`	`}`
`201`	`201`
`202`		`- if(null === $domain){`
	`202`	`+ if (null === $domain) {`
`203`	`203`	`$parsed = explode('@', $id);`
`204`	`204`	`$id = $parsed[0];`
`205`	`205`	`$domain = $parsed[1] ?? 'messages';`