xingePush#22 兼容JDK 1.6

ablecao · ablecao · commit 4cf8a980a902 · 2018-09-05T17:03:52.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -19,9 +19,7 @@ hs_err_pid*
 PushJavaSDK.iml
 jar/
 target/
-<<<<<<< HEAD
 xinge.eml
 xinge.iml
-=======
 bin/
->>>>>>> 9e2338ce2a5cfd5552b2a8495d56096334ed10c2
+.java-version
