From fb445995ed59b2053910ccfcdded4b434ec2976d Mon Sep 17 00:00:00 2001
From: CGantert345 <57003061+CGantert345@users.noreply.github.com>
Date: Thu, 1 Jul 2021 11:39:27 +0200
Subject: resolve local differences
---
pom.xml | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 69 insertions(+)
(limited to 'pom.xml')
diff --git a/pom.xml b/pom.xml
index 15f9ffd..8c45312 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
4.0.0
org.uic.barcode
@@ -64,3 +65,71 @@
+=======
+
+ 4.0.0
+ org.uic.barcode
+ org.uic.barcode
+ 1.2.6-SNAPSHOT
+ jar
+ UIC barcode
+ encoding and decoding of bar code content according to UIC IRS 90918-9
+
+ src/main/java
+
+
+ src/main/java
+
+ **/*.java
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 2.3.2
+
+
+ ${jdk.version}
+
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+
+
+ attach-sources
+
+ jar
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+
+
+ attach-javadocs
+
+ jar
+
+
+
+
+
+
+
+
+
+
+
+ The Apache Software License, Version 2.0
+ http://www.apache.org/licenses/LICENSE-2.0.txt
+ repo
+
+
+
+>>>>>>> refs/heads/FCB_version_3.0.0
--
cgit v1.2.3