From c56c883b02e278ba0f8e6b0fff0a05b5fad97e94 Mon Sep 17 00:00:00 2001
From: CGantert345 <57003061+CGantert345@users.noreply.github.com>
Date: Thu, 1 Jul 2021 11:53:12 +0200
Subject: merge conflict resolved

---
 pom.xml | 71 +----------------------------------------------------------------
 1 file changed, 1 insertion(+), 70 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8c45312..1d3edfa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.uic.barcode</groupId>
@@ -64,72 +63,4 @@
             <distribution>repo</distribution>
         </license>
   </licenses>
-</project>
-=======
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.uic.barcode</groupId>
-  <artifactId>org.uic.barcode</artifactId>
-  <version>1.2.6-SNAPSHOT</version>
-  <packaging>jar</packaging>
-  <name>UIC barcode</name>
-  <description>encoding and decoding of bar code content according to UIC IRS 90918-9</description>
-  <build>
-    <sourceDirectory>src/main/java</sourceDirectory>
-    <resources>
-      <resource>
-        <directory>src/main/java</directory>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </resource>
-    </resources>
-
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
-           <configuration>
-               <source>${jdk.version}</source>
-               <target>${jdk.version}</target>
-           </configuration>
-      </plugin>
-      <plugin>
-		  <groupId>org.apache.maven.plugins</groupId>
-		  <artifactId>maven-source-plugin</artifactId>
-		  <executions>
-		    <execution>
-		      <id>attach-sources</id>
-		      <goals>
-		        <goal>jar</goal>
-		      </goals>
-		    </execution>
-		  </executions>
-		</plugin>
-      <plugin>
-		  <groupId>org.apache.maven.plugins</groupId>
-		  <artifactId>maven-source-plugin</artifactId>
-		  <executions>
-		    <execution>
-		       <id>attach-javadocs</id>
-		       <goals>
-		          <goal>jar</goal>
-		       </goals>
-		    </execution>
-		  </executions>
-		</plugin>		
-    </plugins>
-   
-  </build>
-  
-  
-  <licenses>
-        <license>
-            <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-        </license>
-  </licenses>
-</project>
->>>>>>> refs/heads/FCB_version_3.0.0
+</project>
\ No newline at end of file
-- 
cgit v1.2.3