thinktomorrow / chief

src/Fields/Types/DocumentField.php

Indentation +1 added lines, -4 removed lines

@@ -36,7 +36,4 @@
 
     private function getMedia(HasAsset $model, $locale = null)
     {
-        return $model->assets($this->key(), $locale)->all();
-    }
->>>>>>> 0b857885b773fe2d5321aefa1f512733906e1067
-}
+        return $model->assets($this->key(), $locale
\ No newline at end of file

src/Management/ManagesMedia.php

Indentation +1 added lines, -3 removed lines

@@ -28,6 +28,4 @@
 
 >>>>>>> 0b857885b773fe2d5321aefa1f512733906e1067
         /** @var UploadMedia */
-        app(UploadMedia::class)->fromUploadComponent($this->model, $files, $filesOrder);
-    }
-}
+        app(UploadMedia::class)->fromUploadComponent($this->model, $files, $filesOrder
\ No newline at end of file