From a52def3cdaab0ee68817e140045e4935c80cdf27 Mon Sep 17 00:00:00 2001
From: Stephane Dallongeville <stephane.dallongeville@pasteur.fr>
Date: Wed, 24 Aug 2022 12:29:43 +0200
Subject: [PATCH] fixed conflict
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2de5a59..c5c56e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
--
GitLab