matethurzo/liferay-portal — pull request #225 by danielreuther (2012-07-24 11:51:22+00:00)
Title: LPS-28650

Heya Máté,

Actually, we ran into this only when debugging a customer issue. The main problem is that without that warning it becomes very unobvious why the merging fails—it took us a lot of time to figure it out.

Essentially, it is just a copy'n'paste from line 913 of the same class that was put in place for the layout set.

Thanks,
Daniel