release merge conflict error

This commit is contained in:
CarlNation 2023-04-26 09:33:57 -04:00
parent a3e12ebff2
commit cc56290798

View file

@ -167,34 +167,6 @@ export default {
lastValuePushedToGa: null,
};
},
<<<<<<< HEAD:src/digital-components/button-question/button-question.vue
=======
watch: {
answers() {
//once we get the answers to display from parent, see if we need a GA event to log what we showed
if (this.logDisplayedValuesEvent && this.answers.length > 0) {
var eventLabel = "";
//build comma separated list of all items in button list that we are going to display on page
this.answers.forEach((item) => {
if (item.Name) {
eventLabel += item.Name + ",";
}
if (item.buttonLabel) {
eventLabel += item.buttonLabel + ",";
}
});
eventLabel = eventLabel.slice(0, -1); //remove the last comma
this.pushEventToGA(
this.$route.query[queryStrings.FMG_PAGE],
this.GaActions.DISPLAYED,
eventLabel,
true
);
}
},
},
>>>>>>> 2023.05.04:src/common-components/button-question/button-question.vue
computed: {
getFieldSetClasses() {
const baseClasses = this.isOverflowScrollable