Skip to content
Snippets Groups Projects
Commit a52def3c authored by Stéphane DALLONGEVILLE's avatar Stéphane DALLONGEVILLE
Browse files

fixed conflict

parent d63b67a1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
pom.xml
+ 2
− 2
View file @ a52def3c
......@@ -5,10 +5,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>pom-icy</artifactId>
<groupId>org.bioimageanalysis.icy</groupId>
<artifactId>pom-icy</artifactId>
<version>2.0.0</version>
</parent>
</parent>
<artifactId>micromanager-block</artifactId>
<version>1.0.4</version>
......
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