Resolve conflict

IMA-WorldHealth · Aug 6, 2021 · adb1925 · adb1925
1 parent 8c0631b
commit adb1925
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 deletions.
diff --git a/client/src/i18n/en/stock.json b/client/src/i18n/en/stock.json
@@ -244,12 +244,9 @@
     "SUCCESSFULLY_DELETED" : "Successfully deleted",
     "TO"              : "Destination",
     "UNIT_COST"       : "Unit cost",
-<<<<<<< HEAD
     "UNIT_COST_SH"    : "Unit cost + S&H",
     "UNIT_COST_SH_NOTE" : "This unit cost includes distributed Shipping and Handling costs",
-=======
     "USABLE_AVAILABLE_STOCK": "Usable available stock",
->>>>>>> 38aa12dd0 (feature(Consider expired stock like stock out))
     "ANTERIOR_DATE_QUANTITY_MESSAGE" : "You have chosen a past date. Only the lots available on the chosen date will be visible as well as the quantity on this date",
     "STOCK_COST_DESCRIPTION" : "Monetary values are based on the cost of purchasing inventory, not the selling price",
     "STOCK_UNIT_COST_ROUNDED" : "The unit cost is rounded with two decimals",

diff --git a/client/src/i18n/fr/stock.json b/client/src/i18n/fr/stock.json
@@ -244,12 +244,9 @@
     "SUCCESSFULLY_DELETED" : "Supprimé avec succès",
     "TO"              : "Destination",
     "UNIT_COST"       : "Coût unitaire",
-<<<<<<< HEAD
     "UNIT_COST_SH"    : "Coût unitaire + E&M",
     "UNIT_COST_SH_NOTE" : "Ce coût unitaire comprend les frais d'Expédition et de Manutention distribués",
-=======
     "USABLE_AVAILABLE_STOCK": "Stock disponible utilisable",
->>>>>>> 38aa12dd0 (feature(Consider expired stock like stock out))
     "ANTERIOR_DATE_QUANTITY_MESSAGE" : "Vous avez choisi une date anterieur, seul les lots disponibles à la date choisie seront visibles ainsi que la quantité à cette date",
     "STOCK_COST_DESCRIPTION" : "Les valeurs monetaires sont basées sur le coût d'achat de stock et non sur le prix de vente",
     "STOCK_UNIT_COST_ROUNDED" : "Le cout unitaire est arrondi avec deux decimales",