mend

xtf-cz · Jun 19, 2023 · bae27db · bae27db
1 parent 56214e7
commit bae27db
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 12 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -5,11 +5,7 @@
 	<parent>
 		<artifactId>xtf-parent</artifactId>
 		<groupId>cz.xtf</groupId>
-<<<<<<< HEAD
 		<version>0.31-SNAPSHOT</version>
-=======
-		<version>0.30-SNAPSHOT</version>
->>>>>>> b1fbb8e (mend)
 	</parent>
 
 	<artifactId>core</artifactId>

diff --git a/http-client/pom.xml b/http-client/pom.xml
@@ -5,11 +5,7 @@
 	<parent>
 		<artifactId>xtf-parent</artifactId>
 		<groupId>cz.xtf</groupId>
-<<<<<<< HEAD
 		<version>0.31-SNAPSHOT</version>
-=======
-		<version>0.30-SNAPSHOT</version>
->>>>>>> b1fbb8e (mend)
 	</parent>
 
 	<artifactId>http-client</artifactId>

diff --git a/junit5/pom.xml b/junit5/pom.xml
@@ -5,11 +5,7 @@
     <parent>
         <artifactId>xtf-parent</artifactId>
         <groupId>cz.xtf</groupId>
-<<<<<<< HEAD
         <version>0.31-SNAPSHOT</version>
-=======
-        <version>0.30-SNAPSHOT</version>
->>>>>>> b1fbb8e (mend)
     </parent>
 
     <artifactId>junit5</artifactId>