From 186ab4d1046485fd32042a546e91f369ec274997 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Wed, 13 Mar 2019 11:44:47 +0100
Subject: [PATCH] fix merge
---
entity/Organisation_entity/Organisation_entity.aod | 2 +-
language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod | 10 ++--------
language/_____LANGUAGE_de/_____LANGUAGE_de.aod | 6 ++++++
language/_____LANGUAGE_en/_____LANGUAGE_en.aod | 6 ++++++
4 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index e92b623edf5..8546885e0c6 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -649,4 +649,4 @@
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
-</entity
+</entity>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 962c259b99b..e4ca214b200 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2491,7 +2491,7 @@
<key>member</key>
</entry>
<entry>
- <key>promotion target by</key>
+ <key>promotion target of</key>
</entry>
<entry>
<key>supports</key>
@@ -2556,12 +2556,6 @@
<entry>
<key>New attribute</key>
</entry>
- <entry>
- <key>Special price list</key>
- </entry>
- <entry>
- <key>New attribute</key>
- </entry>
<entry>
<key>MQC</key>
</entry>
@@ -2585,4 +2579,4 @@ select AB_OBJECTRELATIONTYPE.RELATION_TITLE from AB_OBJECTRELATIONTYPE</element>
</statements>
</languageSql>
</sqlModels>
-</language
+</language>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 5cccefb30b2..522be629dc2 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -2997,6 +2997,12 @@
<entry>
<key>Special price list1</key>
</entry>
+ <entry>
+ <key>MQC</key>
+ </entry>
+ <entry>
+ <key>Relation type</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 3d9d3a99916..bee9e3c109e 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -2583,6 +2583,12 @@
<entry>
<key>New attribute</key>
</entry>
+ <entry>
+ <key>MQC</key>
+ </entry>
+ <entry>
+ <key>Relation type</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
--
GitLab