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

ba9f7a89

Commit ba9f7a89 authored 6 years ago by Patient NTUMBA

Downloads
- Patches
- Plain Diff

Resolved merge conflict between master and chorevolution branches

parent 897cbf3a

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/WarGenerator.java 0 additions, 1 deletion

...u/chorevolution/vsb/artifact/generators/WarGenerator.java
vsb-manager-api/src/main/java/eu/chorevolution/vsb/manager/api/VsbManager.java 26 additions, 22 deletions

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

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