conflict resolution

This commit is contained in:
altairis-noe 2021-04-20 16:56:15 +02:00
parent d340e21cb3
commit f1d68c201b

View File

@ -32,3 +32,4 @@ CustomMasks=Adds an option to define mask in the product card
LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned