From e08cfc0c8995cacdc02d82e387a3dfefb1916e17 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Thu, 9 May 2019 13:06:43 +0200
Subject: [PATCH] fix merge error

---
 entity/AttributeRelation_entity/AttributeRelation_entity.aod | 1 +
 1 file changed, 1 insertion(+)

diff --git a/entity/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
index 3e759ee766e..22812c87250 100644
--- a/entity/AttributeRelation_entity/AttributeRelation_entity.aod
+++ b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
@@ -14,6 +14,7 @@
     </entityField>
     <entityField>
       <name>UID</name>
+      <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/uid/valueProcess.js</valueProcess>
     </entityField>
     <entityParameter>
       <name>ObjectType_param</name>
-- 
GitLab