Commit c99d46ed authored by Philipp Spohr's avatar Philipp Spohr
Browse files

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/
parents e17a86c6 f779c437
......@@ -116,4 +116,4 @@ warning = Warning
wrapperVersion = Yoshiko Plugin for Cytoscape Version
yoshTask = Performing Yoshiko Algorithm
yoshVersion = Yoshiko Version
yoshikoHint = Yoshiko Hint
\ No newline at end of file
yoshikoHint = Yoshiko Hint
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