From 8e00e62616559bc7db56ecfee6f7ee3ee36d4d36 Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Mon, 7 Nov 2022 13:31:54 +0100
Subject: [PATCH] chore: resolve merge conflicts

---
 erpnext/translations/de.csv | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/erpnext/translations/de.csv b/erpnext/translations/de.csv
index d79d31cc814..bb7bf5528fe 100644
--- a/erpnext/translations/de.csv
+++ b/erpnext/translations/de.csv
@@ -9873,8 +9873,6 @@ Leave Type Allocation,Zuordnung Abwesenheitsarten,
 From Lead,Aus Lead,
 From Opportunity,Aus Chance,
 Publish in Website,Auf Webseite veröffentlichen,
-<<<<<<< HEAD
-=======
 Total Allocated Leave(s),Gesamte zugewiesene Urlaubstage,
 Expired Leave(s),Verfallene Urlaubstage,
 Used Leave(s),Verbrauchte Urlaubstage,
@@ -9907,4 +9905,3 @@ Total Asset,Aktiva,
 Total Liability,Verbindlichkeiten,
 Total Equity,Eigenkapital,
 Warehouse wise Stock Value,Warenwert nach Lager,
->>>>>>> d2b6490bca (chore: add german translations (#32846))