From de31ac6e71bee3e4676e2720fec6e2a5e5dbcc62 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Tue, 15 Sep 2020 11:07:00 +0200
Subject: [PATCH] fix merge errors
---
.liquibase/Data_alias/changelog.xml | 2 +-
entity/Salesproject_entity/Salesproject_entity.aod | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.liquibase/Data_alias/changelog.xml b/.liquibase/Data_alias/changelog.xml
index 485c35f91ac..b2fb83292f5 100644
--- a/.liquibase/Data_alias/changelog.xml
+++ b/.liquibase/Data_alias/changelog.xml
@@ -19,5 +19,5 @@
<include relativeToChangelogFile="true" file="basic/2020.2.0/changelog.xml"/>
<!--enable this only when you definetly want to overwrite the existing data with demo records:-->
- <!--<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>--
+ <!--<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>-->
</databaseChangeLog>
\ No newline at end of file
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 84c89c142bd..a04269fdb7a 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -803,7 +803,7 @@
<primaryKey>CLASSIFICATIONSTORAGEID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
- </linkInformation
+ </linkInformation>
<linkInformation>
<name>44fba381-e477-4a92-ba82-fc22c3d98c23</name>
<tableName>MST_TEAM</tableName>
--
GitLab