Skip to content

Solve conflicts templating vars

Jose Ivan Vargas requested to merge jivanvl-solve-conflicts-templating-vars into 13-1-stable-ee-patch-1

What does this MR do?

This fixes the conflicts for the 13.1 release of the following MR:

!34668 (merged)

Screenshots

Does this MR meet the acceptance criteria?

Conformity

Edited by 🤖 GitLab Bot 🤖

Merge request reports