Fixed additional conflicts from previous merge
[pithos] / docs /
drwxr-xr-x   ..
drwxr-xr-x - build
drwxr-xr-x - source