diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 0a6ec78..7cd14a7 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -6,11 +6,7 @@
-<<<<<<< HEAD
-=======
-
->>>>>>> origin/rets-io-client-api/main
diff --git a/pom.xml b/pom.xml
index 91a6819..64d0b73 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,24 +1,29 @@
-<<<<<<< HEAD
4.0.0
com.ossez.rets-io
rets-io-client
- 0.1.1
-
+ 0.0.1-SNAPSHOT
jar
- REoC RETS Client
- http://maven.apache.org
-
-
- 1.8
- UTF-8
- UTF-8
+ Rets-Io-Client
+ The RETS API is a Reference Implementation API for RETS Transactions written in Java and can be used as
+ an API by web-based and desktop RETS Client Applications.
+
+ https://github.com/USRealEstate/rets-io-client.git
-
- 1.2.3
-
+
+
+ YuCheng Hu
+ honeymoose
+ huyuchengus@gmail.com
+ -5
+ Open Source
+
+ Sr. Java Developer
+
+
+
@@ -34,6 +39,14 @@
+
+
+ com.ossez.usreio
+ rets-io-common
+ 0.0.1-SNAPSHOT
+
+
+
ch.qos.logback
@@ -89,6 +102,7 @@
+ package
src/main/java
@@ -100,6 +114,7 @@
true
+
maven-compiler-plugin
@@ -125,96 +140,9 @@
jar-with-dependencies
-=======
-
-
- 4.0.0
- com.ossez.usreio
- rets-io-client-api
- 0.0.1-SNAPSHOT
- jar
-
- Rets-Io-Client-Api
- The RETS API is a Reference Implementation API for RETS Transactions written in Java and can be used as
- an API by web-based and desktop RETS Client Applications.
-
- https://github.com/USRealEstate/rets-io-validation.git
-
-
-
- YuCheng Hu
- honeymoose
- huyuchengus@gmail.com
- -5
- Open Source
-
- Sr. Java Developer
-
-
-
-
-
-
- com.ossez.usreio
- rets-io-common
- 0.0.1-SNAPSHOT
-
-
-
- ch.qos.logback
- logback-classic
- 1.2.5
-
-
-
-
- commons-httpclient
- commons-httpclient
- 3.1
-
-
- org.apache.ant
- ant
- 1.9.4
-
-
-
-
- xalan
- xalan
- 2.7.2
-
-
- javax.activation
- javax.activation-api
- 1.2.0
-
-
- javax.mail
- mail
- 1.4
-
-
-
-
- org.junit.jupiter
- junit-jupiter-api
- 5.7.0
- test
-
-
- org.junit.jupiter
- junit-jupiter-engine
- 5.7.0
- test
-
-
-
-
- package
-
+
+
+
org.apache.maven.plugins
maven-compiler-plugin
@@ -235,17 +163,13 @@
jar
->>>>>>> origin/rets-io-client-api/main
+
-<<<<<<< HEAD
-
-=======
-
@@ -257,6 +181,7 @@
1.7.30
1.2.17
2.2
+ 1.2.5
2.11.0
@@ -301,4 +226,3 @@
->>>>>>> origin/rets-io-client-api/main