Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
minerva
core
Commits
7ba78852
Commit
7ba78852
authored
Feb 02, 2017
by
Piotr Gawron
Browse files
fix on merge issues
parent
b8137f18
Changes
2
Hide whitespace changes
Inline
Side-by-side
CHANGELOG
View file @
7ba78852
minerva (11.0.0) stable; urgency=medium
minerva (10.0.5) stable; urgency=medium
* Bug fix: interacting drugs can be found for RNAs
...
...
frontend-js/src/main/js/Functions.js
View file @
7ba78852
...
...
@@ -196,9 +196,9 @@ Functions.overlayToColor = function(elementOverlay) {
blue
=
blue
&
MAX_BLUE
;
var
color
=
red
|
green
|
blue
;
return
intToColorString
(
color
);
return
this
.
intToColorString
(
color
);
}
else
{
logger
.
e
rror
(
"
elementOverlay doesn't have neither color nor value set!
"
);
throw
new
E
rror
(
"
elementOverlay doesn't have neither color nor value set!
"
);
}
};
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment