From 10ac8d6e6709f9d739fa4b132b211efaa91c9448 Mon Sep 17 00:00:00 2001
From: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Date: Thu, 15 Dec 2022 00:11:35 +0100
Subject: [PATCH] chore: resolve merge conflicts

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

diff --git a/erpnext/translations/de.csv b/erpnext/translations/de.csv
index 83c346c693f..0b173b65a9e 100644
--- a/erpnext/translations/de.csv
+++ b/erpnext/translations/de.csv
@@ -9899,17 +9899,3 @@ Total Asset,Aktiva,
 Total Liability,Verbindlichkeiten,
 Total Equity,Eigenkapital,
 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)