Skip to content
Snippets Groups Projects
Commit e08cfc0c authored by Johannes Goderbauer's avatar Johannes Goderbauer
Browse files

fix merge error

parent 2ed506a3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
entity/AttributeRelation_entity/AttributeRelation_entity.aod
+ 1
− 0
View file @ e08cfc0c
......@@ -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>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment