OC-1701: Conflict detected in keep-in-sync
authormasensio <masensio@solidgear.es>
Mon, 14 Oct 2013 10:48:26 +0000 (12:48 +0200)
committermasensio <masensio@solidgear.es>
Mon, 14 Oct 2013 10:48:26 +0000 (12:48 +0200)
commit98d95b576ead4119ec16719a72d83ca6db82b77a
tree4f9c2b780594e2ccb34c0afc9720aa4fec5d1443
parent31ccf4e966f6bd9a4e0716dbec7e6830c36aa94b
OC-1701: Conflict detected in keep-in-sync
src/com/owncloud/android/operations/SynchronizeFileOperation.java