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

bb11e6f3

Commit bb11e6f3 authored 6 years ago by Patient NTUMBA

Downloads
- Patches
- Plain Diff

Resolved merge conflict between master and chorevolution branches

parent 982d4fa1

No related branches found

No related tags found

No related merge requests found

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

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

...a/eu/chorevolution/vsb/artifact/generators/Generator.java
vsb-manager-api/src/main/java/eu/chorevolution/vsb/manager/api/VsbManager.java 17 additions, 16 deletions

...ain/java/eu/chorevolution/vsb/manager/api/VsbManager.java

with 18 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