Commit 7ba78852 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

fix on merge issues

parent b8137f18
minerva (11.0.0) stable; urgency=medium
minerva (10.0.5) stable; urgency=medium
* Bug fix: interacting drugs can be found for RNAs
......
......@@ -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.error("elementOverlay doesn't have neither color nor value set!");
throw new Error("elementOverlay doesn't have neither color nor value set!");
}
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment