missed one conflict

mikaelgrev · Apr 20, 2021 · 413f28c · 413f28c
1 parent 724866f
commit 413f28c
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/swt/pom.xml b/swt/pom.xml
@@ -4,12 +4,7 @@
 	<parent>
 		<groupId>com.miglayout</groupId>
 		<artifactId>miglayout-parent</artifactId>
-<<<<<<< HEAD
-		<version>5.3</version>
-		<relativePath>../pom.xml</relativePath>
-=======
 		<version>11.0-SNAPSHOT</version>
->>>>>>> pr/82
 	</parent>
 	<artifactId>miglayout-swt</artifactId>
 	<name>MiGLayout SWT</name>