fixup! fix(dav): finalize upload metadata before downgrading lock

Signed-off-by: SebastianKrupinski <krupinskis05@gmail.com>

Author: SebastianKrupinski

apps/dav/lib/Connector/Sabre/File.php

@@ -347,14 +347,9 @@ public function put($data) {
 
 	private function finalizeUpload(IStorage $storage, string $internalPath, bool $exists, ?View $view): void {
 		// Since we skipped the view for the final publish step, finalize the file
-<<<<<<< HEAD
 		// state explicitly here: update cache/bookkeeping, persist metadata, then
 		// downgrade to a shared lock before emitting post-write hooks so listeners
 		// can still access the file.
-=======
-		// state explicitly here: update cache/bookkeeping, persist metadata, emit
-		// post-write hooks, and only then downgrade the lock.
->>>>>>> 09a413c0b2b (fix(dav): finalize upload metadata before downgrading lock)
 		$storage->getUpdater()->update($internalPath);
 
 		$fileInfoUpdate = [
@@ -389,28 +384,17 @@ private function finalizeUpload(IStorage $storage, string $internalPath, bool $e
 		$this->fileView->putFileInfo($this->path, $fileInfoUpdate);
 		$this->refreshInfo();
 
-<<<<<<< HEAD
 		// Downgrade to shared lock before post hooks so legacy hook consumers can
 		// still access the file during post_write.
-=======
-		if ($view) {
-			$this->emitPostHooks($exists);
-		}
-
-		// Keep the exclusive lock until all bookkeeping and metadata updates are complete.
->>>>>>> 09a413c0b2b (fix(dav): finalize upload metadata before downgrading lock)
 		try {
 			$this->changeLock(ILockingProvider::LOCK_SHARED);
 		} catch (LockedException $e) {
 			throw new FileLocked($e->getMessage(), $e->getCode(), $e);
 		}
-<<<<<<< HEAD
 
 		if ($view) {
 			$this->emitPostHooks($exists);
 		}
-=======
->>>>>>> 09a413c0b2b (fix(dav): finalize upload metadata before downgrading lock)
 	}
 
 	private function getPartFileBasePath($path) {