From 523b82f0d2fa8f18a3df1fa038e969527de7d2d1 Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Fri, 19 Nov 2021 16:16:30 +0000
Subject: [PATCH] ISTWCMS-5128: coding standards
---
src/Service/UwNodeFieldValue.php | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/Service/UwNodeFieldValue.php b/src/Service/UwNodeFieldValue.php
index 4aed3044..794ac06d 100644
--- a/src/Service/UwNodeFieldValue.php
+++ b/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 {
--
GitLab