Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

K

kernel
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

966f98da

Commit 966f98da authored 5 years ago by Johannes Eder

Downloads
- Plain Diff

fixed master merge conflict

Issue-Ref: 3974
Issue-Url: https://af3-developer.fortiss.org/issues/3974



Signed-off-by: Johannes Eder <eder@fortiss.org>

parents 8559fbe8 85c92880

No related branches found

No related tags found

Loading

Changes 44

Hide whitespace changes

Inline Side-by-side

Showing

org.fortiss.tooling.kernel/model/.ratings 1 addition, 1 deletion

org.fortiss.tooling.kernel/model/.ratings
org.fortiss.tooling.kernel/model/kernel.ecore 0 additions, 105 deletions

org.fortiss.tooling.kernel/model/kernel.ecore
org.fortiss.tooling.kernel/model/kernel.genmodel 0 additions, 28 deletions

org.fortiss.tooling.kernel/model/kernel.genmodel
org.fortiss.tooling.kernel/plugin.xml 0 additions, 8 deletions

org.fortiss.tooling.kernel/plugin.xml

with 1 addition and 142 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