Fix conflicts

Ahmed Raafat · Ahmed Raafat · commit 393bc320009c · 2020-08-11T11:38:53.000+02:00
diff --git a/src/Symfony/Component/Stopwatch/StopwatchEvent.php b/src/Symfony/Component/Stopwatch/StopwatchEvent.php
@@ -250,8 +250,8 @@ public function getName(): string
     {
         return $this->name;
     }
-
-    public function __toString()
+    
+    public function __toString(): string
     {
         return sprintf('%s/%s: %.2F MiB - %d ms', $this->getCategory(), $this->getName(), $this->getMemory() / 1024 / 1024, $this->getDuration());
     }

Original file line number	Diff line number	Diff line change
`@@ -250,8 +250,8 @@ public function getName(): string`
`250`	`250`	`{`
`251`	`251`	`return $this->name;`
`252`	`252`	`}`
`253`		`-`
`254`		`- public function __toString()`
	`253`	`+`
	`254`	`+ public function __toString(): string`
`255`	`255`	`{`
`256`	`256`	`return sprintf('%s/%s: %.2F MiB - %d ms', $this->getCategory(), $this->getName(), $this->getMemory() / 1024 / 1024, $this->getDuration());`
`257`	`257`	`}`