fix merge
This commit is contained in:
parent
5cf1befa3c
commit
fe482ccdb1
@ -45,14 +45,6 @@ class Dummy extends ParentDummy
|
|||||||
* @Groups({"a", "b"})
|
* @Groups({"a", "b"})
|
||||||
*/
|
*/
|
||||||
public $collection;
|
public $collection;
|
||||||
/**
|
|
||||||
* @var string[][]
|
|
||||||
*/
|
|
||||||
public $nestedCollection;
|
|
||||||
/**
|
|
||||||
* @var mixed[]
|
|
||||||
*/
|
|
||||||
public $mixedCollection;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var string[][]
|
* @var string[][]
|
||||||
|
Reference in New Issue
Block a user