Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

O

openbis
- Activity
- Members
- Labels
- Releases
- Model registry

Snippets Groups Projects

bc04baa3

Commit bc04baa3 authored 12 years ago by jakubs

Downloads
- Patches
- Plain Diff

BIS-190 SP-295 fix merge conflicts

SVN: 27529

parent 9ad8ec80

No related merge requests found

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/MetaprojectBO.java 4 additions, 4 deletions

...isd/openbis/generic/server/business/bo/MetaprojectBO.java
openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MetaprojectAssignmentPE.java 1 addition, 1 deletion

...d/openbis/generic/shared/dto/MetaprojectAssignmentPE.java

with 5 additions and 5 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