Merge the modification of the layout tree
Compare changes
Files
4
Conflict: This file was modified in the source branch, but removed in the target branch.
Ask someone with write access to resolve it.
+ 221
− 129
Files with large changes are collapsed by default.