Merge branch 'master' of https://github.com/fiji/AnalyzeSkeleton

iarganda · iarganda · commit a7bc2164685e · 2015-10-20T11:23:26.000+02:00
# Conflicts:
#	pom.xml
diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,6 @@
 
 	<artifactId>AnalyzeSkeleton_</artifactId>
 	<version>2.0.5</version>
-
 	<name>plugins/AnalyzeSkeleton_.jar</name>
 	<description></description>
 
