drupal-media / media

src/Tests/GalleryBundleTest.php

Spacing +2 added lines, -5 removed lines

@@ -10,7 +10,7 @@ 
  * @group media
  */
 class GalleryBundleTest extends WebTestBase {
-<<<<<<< HEAD
+<< << <<< HEAD
   /**
    * Exempt from strict schema checking.
    *
@@ -197,7 +197,4 @@ 
     $item = $this->container->get('entity_type.manager')
       ->getStorage('media')
       ->loadUnchanged($id);
-    return $item;
-  }
-
-}
+    return $item
\ No newline at end of file