ConlictsResolveActivity is finished when the user cancels the ConflictsResolverDialog
[pub/Android/ownCloud.git] / src / eu /
drwxr-xr-x   ..
drwxr-xr-x - alefzero