Skip to content

Commit f1bd5f1

Browse files
committed
Rebase master
Signed-off-by: alperozturk <alper_ozturk@proton.me>
1 parent 1c569fb commit f1bd5f1

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

app/src/main/java/com/owncloud/android/files/services/FileUploader.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -977,8 +977,7 @@ public static void uploadUpdateFile(
977977
OCFile existingFile,
978978
Integer behaviour,
979979
NameCollisionPolicy nameCollisionPolicy,
980-
boolean disableRetries
981-
) {
980+
boolean disableRetries) {
982981
uploadUpdateFile(context,
983982
user,
984983
new OCFile[]{existingFile},

0 commit comments

Comments
 (0)