Fixed conflict (#845)
[gentoo-zh.git] / app-admin / 
tree65cc4b90d76e454018066cf3dfbff320f7df0c0b
drwxr-xr-x   ..
drwxr-xr-x - cockpit