From c8e4998260d0dd85c787ec32b3ec8fbc9f3bf094 Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Tue, 30 Nov 2021 20:24:33 +0000
Subject: [PATCH] ISTWCMS-5204: fixing merge conflict
---
uw_cfg_common.module | 4 ----
1 file changed, 4 deletions(-)
diff --git a/uw_cfg_common.module b/uw_cfg_common.module
index aecdbdd4..e567ac50 100644
--- a/uw_cfg_common.module
+++ b/uw_cfg_common.module
@@ -757,11 +757,7 @@ function uw_cfg_common_preprocess_responsive_image(&$variables) {
else {
// Get the styles used for responsive.
-<<<<<<< HEAD
- $uw_styles = \Drupal::service('uw_cfg_common.uw_service')->getCropImageStyles('portrait');
-=======
$uw_styles = \Drupal::service('uw_cfg_common.uw_service')->getCropImageStyles('responsive');
->>>>>>> origin/feature/ISTWCMS-5206/ebremner-contacts-listing-page-image-theming
}
// Step through each of the sources and see if we are.
--
GitLab