From 0b8c454da556e1fd89ccdd09239deaf6943f418b Mon Sep 17 00:00:00 2001 From: Katie Date: Thu, 18 Aug 2022 16:28:22 -0400 Subject: [PATCH] Fix merge conflict --- .../list-button-horizontal/list-button-horizontal.vue | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/ux-components/list-button-horizontal/list-button-horizontal.vue b/src/ux-components/list-button-horizontal/list-button-horizontal.vue index b54c0804a..aa645ebea 100644 --- a/src/ux-components/list-button-horizontal/list-button-horizontal.vue +++ b/src/ux-components/list-button-horizontal/list-button-horizontal.vue @@ -87,13 +87,8 @@ export default { this.displayLoader(); this.handleCheckChange(); } -<<<<<<< HEAD - - this.pushEventToGA(this.$route.query[queryStrings.FMG_PAGE], this.GaActions.CLICKED, this.value.toString(), true); -======= this.pushEventToGA(this.$route.query[queryStrings.FMG_PAGE], this.GaActions.CLICKED, this.value.toString(), true, this.valueToLogType); ->>>>>>> origin/develop }, handleCheckChange() { const emitEvent = {