Fix coding standard issues

nrobinaubertin · nrobinaubertin · commit 905c7f3e000f · 2020-08-19T09:50:14.000+02:00
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
@@ -200,7 +200,13 @@ protected function isCircularReference(object $object, array &$context)
      * If a circular reference handler is set, it will be called. Otherwise, a
      * {@class CircularReferenceException} will be thrown.
      *
+<<<<<<< HEAD
      * @final
+=======
+     * @final since Symfony 4.2
+     *
+     * @param object $object
+>>>>>>> 256aac17c9... Fix coding standard issues
      *
      * @return mixed
      *

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,13 @@ protected function isCircularReference(object $object, array &$context)`
`200`	`200`	`* If a circular reference handler is set, it will be called. Otherwise, a`
`201`	`201`	`* {@class CircularReferenceException} will be thrown.`
`202`	`202`	`*`
	`203`	`+<<<<<<< HEAD`
`203`	`204`	`* @final`
	`205`	`+=======`
	`206`	`+ * @final since Symfony 4.2`
	`207`	`+ *`
	`208`	`+ * @param object $object`
	`209`	`+>>>>>>> 256aac17c9... Fix coding standard issues`
`204`	`210`	`*`
`205`	`211`	`* @return mixed`
`206`	`212`	`*`