resolving svn conflicts
[infodrom/rico3] / plugins /
drwxr-xr-x   ..
drwxr-xr-x - asp
drwxr-xr-x - dotnet
drwxr-xr-x - php