Fixed conflict (#845)
[gentoo-zh.git] / x11-plugins / 
treeb03f8967aaca3071f59b573196ef62c476c99353
drwxr-xr-x   ..
drwxr-xr-x - vicious