Fixed double request for ConflictsResolveActivity
authorDavid A. Velasco <dvelasco@solidgear.es>
Tue, 4 Aug 2015 14:47:46 +0000 (16:47 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Tue, 4 Aug 2015 14:47:46 +0000 (16:47 +0200)
commit3512eae861faa6ac60ebacdcb16a3db4e1394f4b
tree9a7ee34ea30294a364f07984b96258306ecd8555
parente1ab4a41aa97c9cc978618f88baec5556c1c14f4
Fixed double request for ConflictsResolveActivity
src/com/owncloud/android/ui/activity/FileActivity.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java