Bug: T176236
Change-Id: I0c68ea0e090cfb065d2e3e8acad7025c61c344ca
);
foreach ( $conflicts as $conflictInfo ) {
);
foreach ( $conflicts as $conflictInfo ) {
- $output['conflicts'][] = $conflictInfo;
unset( $conflictInfo['filterObject'] );
unset( $conflictInfo['groupObject'] );
unset( $conflictInfo['filterObject'] );
unset( $conflictInfo['groupObject'] );
+ $output['conflicts'][] = $conflictInfo;
array_push(
$output['messageKeys'],
$conflictInfo['globalDescription'],
array_push(
$output['messageKeys'],
$conflictInfo['globalDescription'],