Merge branch 'master' of https://github.com/nextmcloud/server

nextcloud · May 6, 2021 · 70d525c · 70d525c
2 parents 30f8aef + 23b43f0
commit 70d525c
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/lib/private/Files/ObjectStore/S3ObjectTrait.php b/lib/private/Files/ObjectStore/S3ObjectTrait.php
@@ -79,9 +79,16 @@ public function readObject($urn) {
 			];
 
 			$context = stream_context_create($opts);
+<<<<<<< HEAD
             return fopen($request->getUri(), 'r', false, $context);
         });
     }
+=======
+
+			return fopen($request->getUri(), 'r', false, $context);
+		});
+	}
+>>>>>>> 23b43f02b58d5216b0dd596ad4ed9d39c95ce746
 
 	/**
 	 * @param string   $urn    the unified resource name used to identify the object