fix manual merge conflict resolution

wolpi · Sep 26, 2024 · 6570c60 · 6570c60
1 parent 0488178
commit 6570c60
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/primitiveFTPd/src/org/primftpd/filesystem/SafFileSystemView.java b/primitiveFTPd/src/org/primftpd/filesystem/SafFileSystemView.java
@@ -74,7 +74,7 @@ public T getFile(String file) {
                 } else {
                     // probably upload -> create object just with name
                     String absPath = Utils.toPath(parts);
-                    return createFile(contentResolver, parentDocFile, currentPart, absPath, pftpdService, this);
+                    return createFile(contentResolver, parentDocFile, currentPart, absPath, pftpdService);
                 }
             }