Fixed conflict (#845)
[gentoo-zh.git] / sys-devel / 
tree925b77e7ee98fbf4b096e877a6d401a111c3f4a6
drwxr-xr-x   ..
drwxr-xr-x - ucc