fix merge (61b67803) · Commits · xrm / basic · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

basic
- Activity
- Members
- Releases
- Model registry
- Contributor analytics
- Model experiments

Snippets Groups Projects

61b67803

Commit 61b67803 authored 6 years ago by Johannes Hörmann

Downloads
- Patches
- Plain Diff

fix merge

parent 46b22bff

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

entity/Context_entity/Context_entity.aod 64 additions, 0 deletions

entity/Context_entity/Context_entity.aod
entity/Context_entity/recordcontainers/jdito/contentProcess.js 29 additions, 0 deletions

...y/Context_entity/recordcontainers/jdito/contentProcess.js
entity/ObjectRelation_entity/ObjectRelation_entity.aod 3 additions, 3 deletions

entity/ObjectRelation_entity/ObjectRelation_entity.aod
entity/Object_entity/Object_entity.aod 108 additions, 0 deletions

entity/Object_entity/Object_entity.aod
entity/Object_entity/recordcontainers/jdito/contentProcess.js 5 additions, 0 deletions

...ty/Object_entity/recordcontainers/jdito/contentProcess.js
neonContext/Context_context/Context_context.aod 21 additions, 0 deletions

neonContext/Context_context/Context_context.aod
neonContext/Object_context/Object_context.aod 6 additions, 0 deletions

neonContext/Object_context/Object_context.aod
neonView/ContextLookup_view/ContextLookup_view.aod 22 additions, 0 deletions

neonView/ContextLookup_view/ContextLookup_view.aod
process/Context_lib/process.js 61 additions, 20 deletions

process/Context_lib/process.js

with 319 additions and 23 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment