ISTWCMS-5128: coding standards

src/Service/UwNodeFieldValue.php

@@ -255,7 +255,6 @@ class UwNodeFieldValue {
   }
 
   /**
-<<<<<<< HEAD
    * Gets a plain text field or fields.
    *
    * @param \Drupal\node\Entity\Node $node
@@ -294,8 +293,6 @@ class UwNodeFieldValue {
   }
 
   /**
-   * {@inheritDoc}
-=======
    * Prepares image for theme.
    *
    * @param \Drupal\node\Entity\Node $node
@@ -308,7 +305,6 @@ class UwNodeFieldValue {
    *
    * @throws \Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException
    * @throws \Drupal\Component\Plugin\Exception\PluginNotFoundException
->>>>>>> origin/1.0.x
    */
   public function getImage(Node $node, string $field_name): array {