Solve git conflicts

Signed-off-by: alperozturk <alper_ozturk@proton.me>

app/src/main/java/com/nextcloud/client/files/downloader/FilesDownloadIntents.kt

@@ -80,5 +80,4 @@ class FilesDownloadIntents(private val context: Context) {
             Intent()
         }
     }
-
 }

app/src/main/java/com/nextcloud/client/jobs/BackgroundJobFactory.kt

@@ -266,17 +266,6 @@ class BackgroundJobFactory @Inject constructor(
         )
     }
 
-    private fun createFilesDownloadWorker(context: Context, params: WorkerParameters): FilesDownloadWorker {
-        return FilesDownloadWorker(
-            viewThemeUtils.get(),
-            accountManager,
-            uploadsStorageManager,
-            localBroadcastManager.get(),
-            context,
-            params
-        )
-    }
-
     private fun createPDFGenerateWork(context: Context, params: WorkerParameters): GeneratePdfFromImagesWork {
         return GeneratePdfFromImagesWork(
             appContext = context,