Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
evolution-service-bus
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CHOReVOLUTION
evolution-service-bus
Commits
573f9fc1
Commit
573f9fc1
authored
6 years ago
by
Patient NTUMBA
Browse files
Options
Downloads
Patches
Plain Diff
Resolved merge conflict between master and chorevolution branches
parent
ceb98efa
Loading
Loading
Loading
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
vsb-manager-api/src/main/java/eu/chorevolution/vsb/manager/api/VsbManager.java
+2
-2
2 additions, 2 deletions
...ain/java/eu/chorevolution/vsb/manager/api/VsbManager.java
with
2 additions
and
2 deletions
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
