Added Clear Conflict action to resolver
[pithos-ms-client] / trunk / Pithos.Installer / TortoiseOverlays /
drwxr-xr-x   ..
-rw-r--r-- 1394 License.txt
drwxr-xr-x - icons
drwxr-xr-x - x64
drwxr-xr-x - x86