Skip to content
Snippets Groups Projects
Commit c8e49982 authored by Eric Bremner's avatar Eric Bremner
Browse files

ISTWCMS-5204: fixing merge conflict

parent dddc51df
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 4 deletions
uw_cfg_common.module
+ 0
− 4
View file @ c8e49982
...@@ -757,11 +757,7 @@ function uw_cfg_common_preprocess_responsive_image(&$variables) { ...@@ -757,11 +757,7 @@ function uw_cfg_common_preprocess_responsive_image(&$variables) {
else { else {
// Get the styles used for responsive. // 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'); $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. // Step through each of the sources and see if we are.
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment