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

chore: resolve merge conflicts

Browse Source
This commit is contained in:
barredterra
2022-11-07 13:31:54 +01:00
parent e276a5ba83
commit 8e00e62616
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/translations/de.csv
View File

@@ -9873,8 +9873,6 @@ Leave Type Allocation,Zuordnung Abwesenheitsarten,
From Lead,Aus Lead, From Lead,Aus Lead,
From Opportunity,Aus Chance, From Opportunity,Aus Chance,
Publish in Website,Auf Webseite veröffentlichen, Publish in Website,Auf Webseite veröffentlichen,
<<<<<<< HEAD
=======
Total Allocated Leave(s),Gesamte zugewiesene Urlaubstage, Total Allocated Leave(s),Gesamte zugewiesene Urlaubstage,
Expired Leave(s),Verfallene Urlaubstage, Expired Leave(s),Verfallene Urlaubstage,
Used Leave(s),Verbrauchte Urlaubstage, Used Leave(s),Verbrauchte Urlaubstage,
@@ -9907,4 +9905,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,
>>>>>>> d2b6490bca (chore: add german translations (#32846))
Can't render this file because it is too large.