Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

M

Model_NEGPROGMOD
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

cb076fa3

Commit cb076fa3 authored 2 years ago by Tor-Einar Skog

Downloads
- Plain Diff

Resolve merge conflict

parents 42da60c3 7f982a31

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/no/nibio/vips/model/negativeprognosismodel/NegativePrognosisModel.java 13 additions, 2 deletions

.../model/negativeprognosismodel/NegativePrognosisModel.java
src/main/resources/no/nibio/vips/model/negativeprognosismodel/texts.properties 2 additions, 2 deletions

.../nibio/vips/model/negativeprognosismodel/texts.properties
src/main/resources/no/nibio/vips/model/negativeprognosismodel/texts_nb.properties 3 additions, 3 deletions

...bio/vips/model/negativeprognosismodel/texts_nb.properties

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