Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

evolution-service-bus
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

825a307a

Commit 825a307a authored 6 years ago by Patient NTUMBA

Downloads
- Plain Diff

Resolved merge conflict between master and chorevolution branches

parents 4fc5704f a194da9e

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

bc-generators/artifact-generators/src/main/java/eu/chorevolution/vsb/artifact/generators/Generator.java 0 additions, 8 deletions

...a/eu/chorevolution/vsb/artifact/generators/Generator.java
tools/service-parser/src/main/java/eu/chorevolution/vsb/gmdl/tools/serviceparser/gidl/ParseGIDL.java 5 additions, 5 deletions

...volution/vsb/gmdl/tools/serviceparser/gidl/ParseGIDL.java
vsb-manager-api/src/main/java/eu/chorevolution/vsb/manager/api/VsbManager.java 2 additions, 2 deletions

...ain/java/eu/chorevolution/vsb/manager/api/VsbManager.java
vsb-manager-api/src/test/java/eu/chorevolution/vsb/manager/VsbManagerTest.java 1 addition, 1 deletion

...est/java/eu/chorevolution/vsb/manager/VsbManagerTest.java

with 8 additions and 16 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