nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-16 11:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve merge conflicts

Browse Source
This commit is contained in:
Raffael Meyer
2022-12-15 00:11:35 +01:00
committed by GitHub
parent b13ee4fc8c
commit 10ac8d6e67
1 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/translations/de.csv
View File

@@ -9899,17 +9899,3 @@ Total Asset,Aktiva,
Total Liability,Verbindlichkeiten, Total Liability,Verbindlichkeiten,
Total Equity,Eigenkapital, Total Equity,Eigenkapital,
Warehouse wise Stock Value,Warenwert nach Lager, Warehouse wise Stock Value,Warenwert nach Lager,
<<<<<<< HEAD
=======
Ex Works,Ab Werk,
Free Carrier,Frei Frachtführer,
Free Alongside Ship,Frei Längsseite Schiff,
Free on Board,Frei an Bord,
Carriage Paid To,Frachtfrei,
Carriage and Insurance Paid to,Frachtfrei versichert,
Cost and Freight,Kosten und Fracht,
"Cost, Insurance and Freight","Kosten, Versicherung und Fracht",
Delivered at Place,Geliefert benannter Ort,
Delivered at Place Unloaded,Geliefert benannter Ort entladen,
Delivered Duty Paid,Geliefert verzollt,
>>>>>>> 36997d9788 (fix: translation for warning on Overbilling/-receipt/-delivery)
Can't render this file because it is too large.