jason/DigitalConsumer.FixMyGlass
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CASH-1315 - fix accidental merge crud

Browse source
This commit is contained in:
AdamCaouetteSafelite 2025-10-20 08:25:16 -04:00
parent 63b3ef642f
commit 222f27ee75
1 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/helpers/promotions-helper.js
View file

@ -6,15 +6,7 @@ import baseMixin from "@/mixins/base-mixin.js";
export const promoPartNumberStrings = { export const promoPartNumberStrings = {
WIPER_DISCOUNT_PART_NUMBER: "WIPER DISCOUNT", WIPER_DISCOUNT_PART_NUMBER: "WIPER DISCOUNT",
<<<<<<< HEAD
<<<<<<< HEAD
RAIN_REPEL_DISCOUNT_PART_NUMBER: "DISC RAIN DEFEN", RAIN_REPEL_DISCOUNT_PART_NUMBER: "DISC RAIN DEFEN",
=======
RAIN_REPEL_DISCOUNT_PART_NUMBER: "DISCOUNT",
>>>>>>> 2730b0650 (CASH-1426)
=======
RAIN_REPEL_DISCOUNT_PART_NUMBER: "DISC RAIN DEFEN",
>>>>>>> 3b171fe57 (CASH-1426)
GLASS_DISCOUNT_PART_NUMBER: "DISCOUNT", GLASS_DISCOUNT_PART_NUMBER: "DISCOUNT",
GLASS_CLEANER_DISCOUNT_PART_NUMBER: "DISC GLASS CLN", GLASS_CLEANER_DISCOUNT_PART_NUMBER: "DISC GLASS CLN",
}; };